help: fix leaking return value from help_unknown_cmd()
While `help_unknown_cmd()` would usually die on an unknown command, it instead returns an autocorrected command when "help.autocorrect" is set. But while the function is declared to return a string constant, it actually returns an allocated string in that case. Callers thus aren't aware that they have to free the string, leading to a memory leak. Fix the function return type to be non-constant and free the returned value at its only callsite. Note that we cannot simply take ownership of `main_cmds.names[0]->name` and then eventually free it. This is because the `struct cmdname` is using a flex array to allocate the name, so the name pointer points into the middle of the structure and thus cannot be freed. 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
889c597961
commit
7720dbe99b
2
help.h
2
help.h
@ -32,7 +32,7 @@ void list_all_other_cmds(struct string_list *list);
|
||||
void list_cmds_by_category(struct string_list *list,
|
||||
const char *category);
|
||||
void list_cmds_by_config(struct string_list *list);
|
||||
const char *help_unknown_cmd(const char *cmd);
|
||||
char *help_unknown_cmd(const char *cmd);
|
||||
void load_command_list(const char *prefix,
|
||||
struct cmdnames *main_cmds,
|
||||
struct cmdnames *other_cmds);
|
||||
|
Reference in New Issue
Block a user