Skip to contentSkip to conversation

merge: release strbuf after use in suggest_conflicts()

PATCH In review René Scharfe 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore

René Scharfe

author
#0 lore raw

PATCH 1/1 merge: release strbuf after use in suggest_conflicts()

Signed-off-by Rene Scharfe <[email protected]>
---
 builtin/merge.c | 1 +
 1 file changed, 1 insertion(+)
builtin/merge.c +1 -0
index 215d485..d722889 100644
@@ -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; "
Signature · 1 line
2.2.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · René Scharfe
Signed-off-by Rene Scharfe <[email protected]>
---
 builtin/merge.c | 1 +
 1 file changed, 1 insertion(+)
builtin/merge.c +0 -0
index 215d485..d722889 100644

builtin/merge.c static int suggest_conflicts(void) · line 900

Quoted 7 lines
builtin/merge.c +1 -0
@@ -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 <[email protected]>