builtin/help: fix leaking html_path
when reading config multiple times
The `html_path` variable gets populated via `git_help_config()`, which puts an allocated string into it if its value has been configured. We do not clear the old value though, which causes a memory leak in case the config exists multiple times. Plug this leak. The leak is exposed by t0012, but plugging it alone is not sufficient to make the test suite pass. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
02e36f9ffa
commit
0f26223b6d
@ -52,7 +52,7 @@ static enum help_action {
|
||||
HELP_ACTION_CONFIG_SECTIONS_FOR_COMPLETION,
|
||||
} cmd_mode;
|
||||
|
||||
static const char *html_path;
|
||||
static char *html_path;
|
||||
static int verbose = 1;
|
||||
static enum help_format help_format = HELP_FORMAT_NONE;
|
||||
static int exclude_guides;
|
||||
@ -409,6 +409,7 @@ static int git_help_config(const char *var, const char *value,
|
||||
if (!strcmp(var, "help.htmlpath")) {
|
||||
if (!value)
|
||||
return config_error_nonbool(var);
|
||||
free(html_path);
|
||||
html_path = xstrdup(value);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user