builtin/fmt-merge-msg: fix leaking buffers

pks-t · gitster · commit 68bd0a94bedf · 2024-09-05T08:49:12.000-07:00
Fix leaking input and output buffers in git-fmt-merge-msg(1).

Signed-off-by: Patrick Steinhardt &lt;ps@pks.im&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
@@ -67,6 +67,8 @@ int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 		return ret;
 	write_in_full(STDOUT_FILENO, output.buf, output.len);
 
+	strbuf_release(&input);
+	strbuf_release(&output);
 	free(inpath);
 	return 0;
 }
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
@@ -8,6 +8,7 @@ test_description='fmt-merge-msg test'
 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,8 @@ int cmd_fmt_merge_msg(int argc, const char *argv, const char prefix)`
`67`	`67`	`return ret;`
`68`	`68`	`write_in_full(STDOUT_FILENO, output.buf, output.len);`
`69`	`69`
	`70`	`+ strbuf_release(&input);`
	`71`	`+ strbuf_release(&output);`
`70`	`72`	`free(inpath);`
`71`	`73`	`return 0;`
`72`	`74`	`}`