From: René Scharfe <l.s.r@web.de>
Date: Thu, 7 Dec 2017 20:22:49 +0000 (+0100)
Subject: fmt-merge-msg: avoid leaking strbuf in shortlog()
X-Git-Tag: v2.16.0-rc0~32^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=addcf6cfdeb24a2ae589cbdd0ac1e754310b9ca8;p=git

fmt-merge-msg: avoid leaking strbuf in shortlog()

Use string_list_append_nodup() instead of string_list_append() to hand
over ownership of a detached strbuf and thus avoid leaking its memory.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index efab62fd85..578a0a20e1 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -376,7 +376,8 @@ static void shortlog(const char *name,
 			string_list_append(&subjects,
 					   oid_to_hex(&commit->object.oid));
 		else
-			string_list_append(&subjects, strbuf_detach(&sb, NULL));
+			string_list_append_nodup(&subjects,
+						 strbuf_detach(&sb, NULL));
 	}
 
 	if (opts->credit_people)