summaryrefslogtreecommitdiff
path: root/builtin/notes.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2016-04-01 00:35:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-01 17:31:42 (GMT)
commit344b548475b86f9f95e9fbcd93022f8083918cc7 (patch)
tree7748a0635594f20aedc87bf7a1b316550fb52268 /builtin/notes.c
parenta0feb1b1870fbb74f65d6a8951e4b2e2a2347ecf (diff)
downloadgit-344b548475b86f9f95e9fbcd93022f8083918cc7.zip
git-344b548475b86f9f95e9fbcd93022f8083918cc7.tar.gz
git-344b548475b86f9f95e9fbcd93022f8083918cc7.tar.bz2
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/notes.c')
-rw-r--r--builtin/notes.c5
1 files 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;
}