diff options
| author | Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> | 2022-08-09 20:09:04 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-10 13:57:49 -0700 |
| commit | d57690a9c82c8888be6bb8ae17be231a2b2802e6 (patch) | |
| tree | 1bdf423ba71f82abd371f49f5064e6becbfb6374 /builtin/mv.c | |
| parent | mv: rename check_dir_in_index() to empty_dir_has_sparse_contents() (diff) | |
| download | git-d57690a9c82c8888be6bb8ae17be231a2b2802e6.tar.gz git-d57690a9c82c8888be6bb8ae17be231a2b2802e6.zip | |
mv: free the with_slash in check_dir_in_index()
with_slash may be a malloc'd pointer, and when it is, free it.
Helped-by: Derrick Stolee <derrickstolee@github.com>
Helped-by: Victoria Dye <vdye@github.com>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mv.c')
| -rw-r--r-- | builtin/mv.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index 969f464f7d..c17df2a12f 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -133,6 +133,7 @@ static int index_range_of_same_dir(const char *src, int length, */ static int empty_dir_has_sparse_contents(const char *name) { + int ret = 0; const char *with_slash = add_slash(name); int length = strlen(with_slash); @@ -142,14 +143,18 @@ static int empty_dir_has_sparse_contents(const char *name) if (pos < 0) { pos = -pos - 1; if (pos >= the_index.cache_nr) - return 0; + goto free_return; ce = active_cache[pos]; if (strncmp(with_slash, ce->name, length)) - return 0; + goto free_return; if (ce_skip_worktree(ce)) - return 1; + ret = 1; } - return 0; + +free_return: + if (with_slash != name) + free((char *)with_slash); + return ret; } int cmd_mv(int argc, const char **argv, const char *prefix) |