Skip to content

Commit 4c217a4

Browse files
ahuntgitster
authored andcommitted
ls-files: free max_prefix when done
common_prefix() returns a new string, which we store in max_prefix - this string needs to be freed to avoid a leak. This leak is happening in cmd_ls_files, hence is of no real consequence - an UNLEAK would be just as good, but we might as well free the string properly. Leak found while running t0002, see output below: Direct leak of 8 byte(s) in 1 object(s) allocated from: #0 0x49a85d in malloc /home/abuild/rpmbuild/BUILD/llvm-11.0.0.src/build/../projects/compiler-rt/lib/asan/asan_malloc_linux.cpp:145:3 microsoft#1 0x9ab1b4 in do_xmalloc wrapper.c:41:8 microsoft#2 0x9ab248 in do_xmallocz wrapper.c:75:8 microsoft#3 0x9ab22a in xmallocz wrapper.c:83:9 microsoft#4 0x9ab2d7 in xmemdupz wrapper.c:99:16 microsoft#5 0x78d6a4 in common_prefix dir.c:191:15 microsoft#6 0x5aca48 in cmd_ls_files builtin/ls-files.c:669:16 microsoft#7 0x4cd92d in run_builtin git.c:453:11 microsoft#8 0x4cb5fa in handle_builtin git.c:704:3 microsoft#9 0x4ccf57 in run_argv git.c:771:4 microsoft#10 0x4caf49 in cmd_main git.c:902:19 microsoft#11 0x69ce2e in main common-main.c:52:11 microsoft#12 0x7f64d4d94349 in __libc_start_main (/lib64/libc.so.6+0x24349) Signed-off-by: Andrzej Hunt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5493ce7 commit 4c217a4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

builtin/ls-files.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ static int option_parse_exclude_standard(const struct option *opt,
530530
int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
531531
{
532532
int require_work_tree = 0, show_tag = 0, i;
533-
const char *max_prefix;
533+
char *max_prefix;
534534
struct dir_struct dir;
535535
struct pattern_list *pl;
536536
struct string_list exclude_list = STRING_LIST_INIT_NODUP;
@@ -708,5 +708,6 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
708708
}
709709

710710
dir_clear(&dir);
711+
free(max_prefix);
711712
return 0;
712713
}

0 commit comments

Comments
 (0)