mirror of
https://github.com/git/git
synced 2024-09-06 00:18:22 +00:00
Merge branch 'ab/plug-handle-path-exclude-leak'
Leakfix. * ab/plug-handle-path-exclude-leak: config.c: don't leak memory in handle_path_include()
This commit is contained in:
commit
55b99febc4
7
config.c
7
config.c
|
@ -148,8 +148,10 @@ static int handle_path_include(const char *path, struct config_include_data *inc
|
|||
if (!is_absolute_path(path)) {
|
||||
char *slash;
|
||||
|
||||
if (!cf || !cf->path)
|
||||
return error(_("relative config includes must come from files"));
|
||||
if (!cf || !cf->path) {
|
||||
ret = error(_("relative config includes must come from files"));
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
slash = find_last_dir_sep(cf->path);
|
||||
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);
|
||||
inc->depth--;
|
||||
}
|
||||
cleanup:
|
||||
strbuf_release(&buf);
|
||||
free(expanded);
|
||||
return ret;
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='test config file include directives'
|
||||
TEST_PASSES_SANITIZE_LEAK=true
|
||||
. ./test-lib.sh
|
||||
|
||||
# Force setup_explicit_git_dir() to run until the end. This is needed
|
||||
|
|
Loading…
Reference in a new issue