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

config.c: don't leak memory in handle_path_include()

Browse Source 
Fix a memory leak in the error() path in handle_path_include(), this
allows us to run t1305-config-include.sh under SANITIZE=leak,
previously 4 tests there would fail. This fixes up a leak in
9b25a0b52e (config: add include directive, 2012-02-06).

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 2021-10-21 21:54:14 +02:00 committed by Junio C Hamano
parent 9d530dc002
commit 25ad722126
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config.c
View File

@ -148,8 +148,10 @@ static int handle_path_include(const char *path, struct config_include_data *inc
if (!is_absolute_path(path)) { if (!is_absolute_path(path)) {
char *slash; char *slash;
if (!cf || !cf->path) if (!cf || !cf->path) {
return error(_("relative config includes must come from files")); ret = error(_("relative config includes must come from files"));
goto cleanup;
}
slash = find_last_dir_sep(cf->path); slash = find_last_dir_sep(cf->path);
if (slash) if (slash)
@ -167,6 +169,7 @@ static int handle_path_include(const char *path, struct config_include_data *inc
ret = git_config_from_file(git_config_include, path, inc); ret = git_config_from_file(git_config_include, path, inc);
inc->depth--; inc->depth--;
} }
cleanup:
strbuf_release(&buf); strbuf_release(&buf);
free(expanded); free(expanded);
return ret; return ret;

1
t/t1305-config-include.sh
View File

@ -1,6 +1,7 @@
#!/bin/sh #!/bin/sh
test_description='test config file include directives' test_description='test config file include directives'
TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh . ./test-lib.sh
# Force setup_explicit_git_dir() to run until the end. This is needed # Force setup_explicit_git_dir() to run until the end. This is needed