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

* rs/plug-strbuf-leak-in-merge: merge: release strbuf after use in suggest_conflicts()
git-mirror · Jan 12, 2015 · d61e790 · d61e790
2 parents 97488ab + 8d025b7
commit d61e790
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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; "