mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
test-tool path-utils: fix a memory leak
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:
parent
330ca8501b
commit
e287a5b0a4
|
@ -296,9 +296,8 @@ int cmd__path_utils(int argc, const char **argv)
|
|||
if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) {
|
||||
char *buf = xmallocz(strlen(argv[2]));
|
||||
int rv = normalize_path_copy(buf, argv[2]);
|
||||
if (rv)
|
||||
buf = "++failed++";
|
||||
puts(buf);
|
||||
puts(rv ? "++failed++" : buf);
|
||||
free(buf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -356,7 +355,10 @@ int cmd__path_utils(int argc, const char **argv)
|
|||
int nongit_ok;
|
||||
setup_git_directory_gently(&nongit_ok);
|
||||
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--;
|
||||
argv++;
|
||||
}
|
||||
|
@ -366,6 +368,7 @@ int cmd__path_utils(int argc, const char **argv)
|
|||
if (argc == 4 && !strcmp(argv[1], "strip_path_suffix")) {
|
||||
char *prefix = strip_path_suffix(argv[2], argv[3]);
|
||||
printf("%s\n", prefix ? prefix : "(null)");
|
||||
free(prefix);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
test_description='Test various path utilities'
|
||||
|
||||
TEST_PASSES_SANITIZE_LEAK=true
|
||||
. ./test-lib.sh
|
||||
|
||||
norm_path() {
|
||||
|
|
Loading…
Reference in a new issue