Merge branch 'rs/fmt-merge-msg-string-leak-fix'

gitster · gitster · commit 1f9ce78df081 · 2017-12-27T11:16:23.000-08:00
Leakfix.

* rs/fmt-merge-msg-string-leak-fix:
  fmt-merge-msg: avoid leaking strbuf in shortlog()
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
@@ -377,7 +377,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)

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,8 @@ static void shortlog(const char *name,`
`377`	`377`	`string_list_append(&subjects,`
`378`	`378`	`oid_to_hex(&commit->object.oid));`
`379`	`379`	`else`
`380`		`- string_list_append(&subjects, strbuf_detach(&sb, NULL));`
	`380`	`+ string_list_append_nodup(&subjects,`
	`381`	`+ strbuf_detach(&sb, NULL));`
`381`	`382`	`}`
`382`	`383`
`383`	`384`	`if (opts->credit_people)`