[PATCH] fmt-merge-msg: plug small leak of commit buffer
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 15, 2015, 21:25 UTC
- Message-ID
- <xmqqegnljd80.fsf@gitster.dls.corp.google.com>
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