kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

config: plug user_config leak 

We generate filenames for the user_config ("~/.gitconfig")
and the xdg config ("$XDG_CONFIG_HOME/git/config") and then
decide which to use by looking at the filesystem. But after
selecting one, the unused string is just leaked.

This is a tiny leak, but it creates noise in leak-checker
output.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2017-09-05 09:04:20 -04:00 committed by Junio C Hamano
parent baddc96b2c
commit 6c6b08d269
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/config.c
View File

@ -518,10 +518,13 @@ int cmd_config(int argc, const char **argv, const char *prefix)
die("$HOME not set"); die("$HOME not set");


if (access_or_warn(user_config, R_OK, 0) && if (access_or_warn(user_config, R_OK, 0) &&
xdg_config && !access_or_warn(xdg_config, R_OK, 0)) xdg_config && !access_or_warn(xdg_config, R_OK, 0)) {
given_config_source.file = xdg_config; given_config_source.file = xdg_config;
else free(user_config);
} else {
given_config_source.file = user_config; given_config_source.file = user_config;
free(xdg_config);
}
} }
else if (use_system_config) else if (use_system_config)
given_config_source.file = git_etc_gitconfig(); given_config_source.file = git_etc_gitconfig();