mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/help: fix leaks in check_git_cmd()

Browse Source 
The `check_git_cmd()` function is declared to return a string constant.
And while it sometimes does return a constant, it may also return an
allocated string in two cases:

  - When handling aliases. This case is already marked with `UNLEAK()`
    to work around the leak.

  - When handling unknown commands in case "help.autocorrect" is
    enabled. This one is not marked with `UNLEAK()`.

The function only has a single caller, so let's fix its return type to
be non-constant, consistently return an allocated string and free it at
its callsite to plug the leak.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-11-20 14:39:46 +01:00
committed by Junio C Hamano
parent 7720dbe99b
commit 2379b5c900
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/help.c
View File

@ -551,12 +551,12 @@ static void show_html_page(const char *page)
open_html(page_path.buf); open_html(page_path.buf);
} }
static const char *check_git_cmd(const char* cmd) static char *check_git_cmd(const char *cmd)
{ {
char *alias; char *alias;
if (is_git_command(cmd)) if (is_git_command(cmd))
return cmd; return xstrdup(cmd);
alias = alias_lookup(cmd); alias = alias_lookup(cmd);
if (alias) { if (alias) {
@ -589,14 +589,13 @@ static const char *check_git_cmd(const char* cmd)
die(_("bad alias.%s string: %s"), cmd, die(_("bad alias.%s string: %s"), cmd,
split_cmdline_strerror(count)); split_cmdline_strerror(count));
free(argv); free(argv);
UNLEAK(alias);
return alias; return alias;
} }
if (exclude_guides) if (exclude_guides)
return help_unknown_cmd(cmd); return help_unknown_cmd(cmd);
return cmd; return xstrdup(cmd);
} }
static void no_help_format(const char *opt_mode, enum help_format fmt) static void no_help_format(const char *opt_mode, enum help_format fmt)
@ -642,6 +641,7 @@ int cmd_help(int argc,
{ {
int nongit; int nongit;
enum help_format parsed_help_format; enum help_format parsed_help_format;
char *command = NULL;
const char *page; const char *page;
argc = parse_options(argc, argv, prefix, builtin_help_options, argc = parse_options(argc, argv, prefix, builtin_help_options,
@ -713,9 +713,9 @@ int cmd_help(int argc,
if (help_format == HELP_FORMAT_NONE) if (help_format == HELP_FORMAT_NONE)
help_format = parse_help_format(DEFAULT_HELP_FORMAT); help_format = parse_help_format(DEFAULT_HELP_FORMAT);
argv[0] = check_git_cmd(argv[0]); command = check_git_cmd(argv[0]);
page = cmd_to_page(argv[0]); page = cmd_to_page(command);
switch (help_format) { switch (help_format) {
case HELP_FORMAT_NONE: case HELP_FORMAT_NONE:
case HELP_FORMAT_MAN: case HELP_FORMAT_MAN:
@ -729,5 +729,6 @@ int cmd_help(int argc,
break; break;
} }
free(command);
return 0; return 0;
} }