All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com, peff@peff.net, sunshine@sunshineco.com
Cc: git@vger.kernel.org, Stefan Beller <sbeller@google.com>
Subject: [PATCHv4 1/4] notes: don't leak memory in git_config_get_notes_strategy
Date: Thu, 31 Mar 2016 17:35:43 -0700	[thread overview]
Message-ID: <1459470946-16522-2-git-send-email-sbeller@google.com> (raw)
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

  reply	other threads:[~2016-04-01  0:35 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-01  0:35 [PATCHv4 0/4] Some cleanups Stefan Beller
2016-04-01  0:35 ` Stefan Beller [this message]
2016-04-01  0:46   ` [PATCHv4 1/4] notes: don't leak memory in git_config_get_notes_strategy Eric Sunshine
2016-04-01 16:12     ` Junio C Hamano
2016-04-01 17:03       ` Junio C Hamano
2016-04-01 17:14         ` Jeff King
2016-04-01 17:30           ` Eric Sunshine
2016-04-01  0:35 ` [PATCHv4 2/4] abbrev_sha1_in_line: don't leak memory Stefan Beller
2016-04-01  0:35 ` [PATCHv4 3/4] bundle: don't leak an fd in case of early return Stefan Beller
2016-04-01 17:05   ` Junio C Hamano
2016-04-01 17:15     ` Jeff King
2016-04-01 17:29       ` Junio C Hamano
2016-04-01 17:31         ` Jeff King
2016-04-01  0:35 ` [PATCHv4 4/4] credential-cache, send_request: close fd when done Stefan Beller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1459470946-16522-2-git-send-email-sbeller@google.com \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.