diff options
| author |  Stefan Beller <sbeller@google.com> | 2016-03-31 17:35:43 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-01 10:31:42 -0700 |
| commit | 344b548475b86f9f95e9fbcd93022f8083918cc7 (patch) | |
| tree | 7748a0635594f20aedc87bf7a1b316550fb52268 /builtin | |
| parent | Merge branch 'mm/doc-hooks-linkgit-fix' into maint (diff) | |
| download | tgif-344b548475b86f9f95e9fbcd93022f8083918cc7.tar.xz | |
notes: don't leak memory in git_config_get_notes_strategy
This function asks for the value of a configuration and after
using the value does not have to retain ownership of it.
git_config_get_string_const() however is a function to get a
copy of the value, but we forget to free it before we return.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/notes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 52aa9af74b..afcfa8f522 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; } |