undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-tool path-utils: fix a memory leak

Browse Source 
Fix a memory leak in "test-tool path-utils", as a result we can mark
the corresponding test as passing with SANITIZE=leak using
"TEST_PASSES_SANITIZE_LEAK=true".

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-07-01 12:37:33 +02:00 committed by Junio C Hamano
parent 330ca8501b
commit e287a5b0a4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
t/helper/test-path-utils.c
View File

@ -296,9 +296,8 @@ int cmd__path_utils(int argc, const char **argv)
if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) { if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) {
char *buf = xmallocz(strlen(argv[2])); char *buf = xmallocz(strlen(argv[2]));
int rv = normalize_path_copy(buf, argv[2]); int rv = normalize_path_copy(buf, argv[2]);
if (rv) puts(rv ? "++failed++" : buf);
buf = "++failed++"; free(buf);
puts(buf);
return 0; return 0;
} }
@ -356,7 +355,10 @@ int cmd__path_utils(int argc, const char **argv)
int nongit_ok; int nongit_ok;
setup_git_directory_gently(&nongit_ok); setup_git_directory_gently(&nongit_ok);
while (argc > 3) { while (argc > 3) {
puts(prefix_path(prefix, prefix_len, argv[3])); char *pfx = prefix_path(prefix, prefix_len, argv[3]);
puts(pfx);
free(pfx);
argc--; argc--;
argv++; argv++;
} }
@ -366,6 +368,7 @@ int cmd__path_utils(int argc, const char **argv)
if (argc == 4 && !strcmp(argv[1], "strip_path_suffix")) { if (argc == 4 && !strcmp(argv[1], "strip_path_suffix")) {
char *prefix = strip_path_suffix(argv[2], argv[3]); char *prefix = strip_path_suffix(argv[2], argv[3]);
printf("%s\n", prefix ? prefix : "(null)"); printf("%s\n", prefix ? prefix : "(null)");
free(prefix);
return 0; return 0;
} }

1
t/t0060-path-utils.sh
View File

@ -5,6 +5,7 @@
test_description='Test various path utilities' test_description='Test various path utilities'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
norm_path() { norm_path() {