# [PATCH] merge: release strbuf after use in suggest_conflicts() 2 messages from 2014-12-24 to 2014-12-24. Participants: René Scharfe, Jonathan Nieder. Thread: https://gitlist.dev/t/38240 ## René Scharfe, 2014-12-24 00:18 Subject: [PATCH] merge: release strbuf after use in suggest_conflicts() Message-ID: <549A065E.8060008@web.de> URL: https://gitlist.dev/e/549A065E.8060008%40web.de ``` Signed-off-by: Rene Scharfe --- builtin/merge.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/merge.c b/builtin/merge.c index 215d485..d722889 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; " -- 2.2.1 ``` ## Jonathan Nieder, 2014-12-24 02:11 Subject: Re: [PATCH] merge: release strbuf after use in suggest_conflicts() Message-ID: <20141224021155.GD29365@google.com> URL: https://gitlist.dev/e/20141224021155.GD29365%40google.com In-Reply-To: <549A065E.8060008@web.de> ``` René Scharfe wrote: > Signed-off-by: Rene Scharfe > --- > builtin/merge.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/builtin/merge.c b/builtin/merge.c > index 215d485..d722889 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; " The caller is about to exit so this is a small one-time leak, but freeing it doesn't cost much and makes analysis by valgrind a little easier. So this seems like a good change. Reviewed-by: Jonathan Nieder ```