Merge branch 'rs/plug-strbuf-leak-in-merge'

* rs/plug-strbuf-leak-in-merge: merge: release strbuf after use in suggest_conflicts()
2015-01-12 11:38:32 -08:00 · 2015-01-12 11:38:32 -08:00 · d61e79050c
parent 97488abc91 8d025b7caf
commit d61e79050c
1 changed files with 1 additions and 0 deletions
--- a/builtin/merge.c
+++ b/builtin/merge.c
@ -894,6 +894,7 @@ static int suggest_conflicts(void)

 	append_conflicts_hint(&msgbuf);
 	fputs(msgbuf.buf, fp);
+	strbuf_release(&msgbuf);
 	fclose(fp);
 	rerere(allow_rerere_auto);
 	printf(_("Automatic merge failed; "