{"thread":{"id":"38240","subject":"[PATCH] merge: release strbuf after use in suggest_conflicts()","startedAt":"2014-12-24T00:18:38Z","lastAt":"2014-12-24T02:11:55Z","messageCount":2,"participants":["René Scharfe","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"254057","messageId":"549A065E.8060008@web.de","threadId":"38240","inReplyTo":null,"subject":"[PATCH] merge: release strbuf after use in suggest_conflicts()","fromName":"René Scharfe","fromEmail":"l.s.r@web.de","sentAt":"2014-12-24T00:18:38Z","receivedAt":"2014-12-24T00:18:38Z","isPatch":true,"sender":{"key":"l.s.r@web.de","avatar":"https://avatars.githubusercontent.com/u/26122331?v=4"},"body":"Signed-off-by: Rene Scharfe <l.s.r@web.de>\n---\n builtin/merge.c | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/builtin/merge.c b/builtin/merge.c\nindex 215d485..d722889 100644\n--- a/builtin/merge.c\n+++ b/builtin/merge.c\n@@ -894,6 +894,7 @@ static int suggest_conflicts(void)\n \n \tappend_conflicts_hint(&msgbuf);\n \tfputs(msgbuf.buf, fp);\n+\tstrbuf_release(&msgbuf);\n \tfclose(fp);\n \trerere(allow_rerere_auto);\n \tprintf(_(\"Automatic merge failed; \"\n-- \n2.2.1\n"},{"id":"254065","messageId":"20141224021155.GD29365@google.com","threadId":"38240","inReplyTo":"549A065E.8060008@web.de","subject":"Re: [PATCH] merge: release strbuf after use in suggest_conflicts()","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2014-12-24T02:11:55Z","receivedAt":"2014-12-24T02:11:55Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"René Scharfe wrote:\n\n> Signed-off-by: Rene Scharfe <l.s.r@web.de>\n> ---\n>  builtin/merge.c | 1 +\n>  1 file changed, 1 insertion(+)\n>\n> diff --git a/builtin/merge.c b/builtin/merge.c\n> index 215d485..d722889 100644\n> --- a/builtin/merge.c\n> +++ b/builtin/merge.c\n> @@ -894,6 +894,7 @@ static int suggest_conflicts(void)\n>  \n>  \tappend_conflicts_hint(&msgbuf);\n>  \tfputs(msgbuf.buf, fp);\n> +\tstrbuf_release(&msgbuf);\n>  \tfclose(fp);\n>  \trerere(allow_rerere_auto);\n>  \tprintf(_(\"Automatic merge failed; \"\n\nThe caller is about to exit so this is a small one-time leak, but\nfreeing it doesn't cost much and makes analysis by valgrind\na little easier.  So this seems like a good change.\n\nReviewed-by: Jonathan Nieder <jrnieder@gmail.com>\n"}]}