Andrew's git / gitweb.git / diff
?
Merge branch 'rs/plug-strbuf-leak-in-merge'
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 19:38:32 +0000 (11:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Jan 2015 19:38:37 +0000 (11:38 -0800)
* rs/plug-strbuf-leak-in-merge:
merge: release strbuf after use in suggest_conflicts()

builtin/merge.c patch | blob | history
diff --git a/builtin/merge.c b/builtin/merge.c
index 9effed7ff15d087a6d6768044ffaa70db1ddac73..c638fd5a9a8165c58d46d4edeeb0f3bbe8c0f9a1 100644 (file)
--- 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; "