From: Junio C Hamano <gitster@pobox•com>
To: git@vger•kernel.org
Cc: Jeff King <peff@peff•net>
Subject: [PATCH] fmt-merge-msg: plug small leak of commit buffer
Date: Wed, 15 Apr 2015 14:25:35 -0700 [thread overview]
Message-ID: <xmqqegnljd80.fsf@gitster.dls.corp.google.com> (raw)
A broken or badly formatted commit might not record author or
committer lines; the function record_person() returned after
calling get_commit_buffer() without calling unuse_commit_buffer()
on the memory, potentially leaking it.
Signed-off-by: Junio C Hamano <gitster@pobox•com>
---
* to be applied on bc6b8fc1 (use get_commit_buffer everywhere,
2014-06-10)
builtin/fmt-merge-msg.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index 01f6d59..076264d 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -238,8 +238,10 @@ static void record_person(int which, struct string_list *people,
field = (which == 'a') ? "\nauthor " : "\ncommitter ";
buffer = get_commit_buffer(commit);
name = strstr(buffer, field);
- if (!name)
+ if (!name) {
+ unuse_commit_buffer(commit, buffer);
return;
+ }
name += strlen(field);
name_end = strchrnul(name, '<');
if (*name_end)
--
2.4.0-rc2-173-gefc434b
next reply other threads:[~2015-04-15 21:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-15 21:25 Junio C Hamano [this message]
2015-04-15 21:30 ` [PATCH] fmt-merge-msg: plug small leak of commit buffer Junio C Hamano
2015-04-15 22:14 ` Jeff King
2015-04-20 21:35 ` Junio C Hamano
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=xmqqegnljd80.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox