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

parse-options: fix leaks for users of OPT_FILENAME

Browse Source 
The `OPT_FILENAME()` option will, if set, put an allocated string into
the user-provided variable. Consequently, that variable thus needs to be
free'd by the caller of `parse_options()`. Some callsites don't though
and thus leak memory. Fix those.

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-06-11 11:19:22 +02:00
committed by Junio C Hamano
parent 56931c4d89
commit 14da26230a
21 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/commit.c
View File

@ -106,7 +106,8 @@ static enum {
COMMIT_PARTIAL
} commit_style;
static const char *logfile, *force_author;
static const char *force_author;
static char *logfile;
static char *template_file;
/*
* The _message variables are commit names from which to take
@ -1309,7 +1310,7 @@ static int parse_and_validate_options(int argc, const char *argv[],
!!use_message, "-C",
!!logfile, "-F");
if (use_message || edit_message || logfile ||fixup_message || have_option_m)
template_file = NULL;
FREE_AND_NULL(template_file);
if (edit_message)
use_message = edit_message;
if (amend && !use_message && !fixup_message)
@ -1892,5 +1893,7 @@ cleanup:
strbuf_release(&author_ident);
strbuf_release(&err);
strbuf_release(&sb);
free(logfile);
free(template_file);
return ret;
}