summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-01-12 19:38:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-12 19:38:37 (GMT)
commitd61e79050cd30231456740c3006aca94ed074db0 (patch)
treec75683876cce895159851f64f11ceca4d2fc7a26 /builtin/merge.c
parent97488abc91217d3ddb0f8fa4b14a51c2cfbde65d (diff)
parent8d025b7cafdd976d1ba34fd8b2df8b669e1cd282 (diff)
downloadgit-d61e79050cd30231456740c3006aca94ed074db0.zip
git-d61e79050cd30231456740c3006aca94ed074db0.tar.gz
git-d61e79050cd30231456740c3006aca94ed074db0.tar.bz2
Merge branch 'rs/plug-strbuf-leak-in-merge'
* rs/plug-strbuf-leak-in-merge: merge: release strbuf after use in suggest_conflicts()
Diffstat (limited to 'builtin/merge.c')
-rw-r--r--builtin/merge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c
index 9effed7..c638fd5 100644
--- 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; "