git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-05-04 19:16:21 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

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

Browse Source 
* rs/plug-strbuf-leak-in-merge:
  merge: release strbuf after use in suggest_conflicts()
This commit is contained in:
Junio C Hamano
2015-01-12 11:38:32 -08:00
parent 97488abc91 8d025b7caf
commit d61e79050c
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/merge.c
View File

@@ -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; "