[PATCHv4 1/4] notes: don't leak memory in git_config_get_notes_strategy
- From
Stefan Beller <sbeller@google.com>
- Date
- Apr 1, 2016, 00:35 UTC
- Message-ID
- <1459470946-16522-2-git-send-email-sbeller@google.com>
- In-Reply-To
- <1459470946-16522-1-git-send-email-sbeller@google.com>
`value` is just a temporary scratchpad, so we need to make sure it doesn't leak. It is xstrdup'd in `git_config_get_string_const` and `parse_notes_merge_strategy` just compares the string against predefined values, so no need to keep it around longer.
Signed-off-by: Stefan Beller <sbeller@google.com> --- builtin/notes.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin/notes.c b/builtin/notes.c index 52aa9af..afcfa8f 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -741,13 +741,14 @@ static int merge_commit(struct notes_merge_options *o) static int git_config_get_notes_strategy(const char *key, enum notes_merge_strategy *strategy) { - const char *value; + char *value; - if (git_config_get_string_const(key, &value)) + if (git_config_get_string(key, &value)) return 1; if (parse_notes_merge_strategy(value, strategy)) git_die_config(key, "unknown notes merge strategy %s", value); + free(value); return 0; }
-- 2.5.0.264.gc776916.dirty