diff options
| author | René Scharfe <l.s.r@web.de> | 2014-12-24 01:18:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-29 09:33:25 -0800 |
| commit | 8d025b7cafdd976d1ba34fd8b2df8b669e1cd282 (patch) | |
| tree | bcdd30a4cdfc456de9a65be59b44c36a1dc05ab8 | |
| parent | bbcefffcea9789e4a1a2023a1c778e2c07db77a7 (diff) | |
| download | git-rs/plug-strbuf-leak-in-merge.tar.gz | |
merge: release strbuf after use in suggest_conflicts()rs/plug-strbuf-leak-in-merge
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 215d4856e5..d72288969f 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; " |