aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6427-diff3-conflict-markers.sh
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2024-06-11 11:19:22 +0200
committerJunio C Hamano <gitster@pobox.com>2024-06-11 13:15:04 -0700
commit14da26230a7644a2f9dfbc3f43d9d7ab6e0074e9 (patch)
tree600341b6864236888a6508a79bf46e97436ded8b /t/t6427-diff3-conflict-markers.sh
parent56931c4d89e7efe41dd96d230b8176e2d32a035d (diff)
downloadgit-14da26230a7644a2f9dfbc3f43d9d7ab6e0074e9.tar.gz
parse-options: fix leaks for users of OPT_FILENAME
The `OPT_FILENAME()` option will, if set, put an allocated string into the user-provided variable. Consequently, that variable thus needs to be free'd by the caller of `parse_options()`. Some callsites don't though and thus leak memory. Fix those. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6427-diff3-conflict-markers.sh')
-rwxr-xr-xt/t6427-diff3-conflict-markers.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t6427-diff3-conflict-markers.sh b/t/t6427-diff3-conflict-markers.sh
index dd5fe6a402..a13271b349 100755
--- a/t/t6427-diff3-conflict-markers.sh
+++ b/t/t6427-diff3-conflict-markers.sh
@@ -5,6 +5,7 @@ test_description='recursive merge diff3 style conflict markers'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
# Setup: