aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7605-merge-resolve.sh
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-11-08 19:17:43 +0100
committerJunio C Hamano <gitster@pobox.com>2022-11-21 12:32:48 +0900
commite84a26e32faba0c2ae7a19fa9bf805645f620e82 (patch)
tree239a450569386ca23cb3480d06d0e91b1562aedf /t/t7605-merge-resolve.sh
parentbuilt-ins & libs & helpers: add/move destructors, fix leaks (diff)
downloadgit-e84a26e32faba0c2ae7a19fa9bf805645f620e82.tar.gz
git-e84a26e32faba0c2ae7a19fa9bf805645f620e82.zip
unpack-file: fix ancient leak in create_temp_file()
Fix a leak that's been with us since 3407bb4940c (Add "unpack-file" helper that unpacks a sha1 blob into a tmpfile., 2005-04-18). See 00c8fd493af (cat-file: use streaming API to print blobs, 2012-03-07) for prior art which shows the same API pattern, i.e. free()-ing the result of read_object_file() after it's used. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 't/t7605-merge-resolve.sh')
-rwxr-xr-xt/t7605-merge-resolve.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
index 5d56c38546..62d935d31c 100755
--- a/t/t7605-merge-resolve.sh
+++ b/t/t7605-merge-resolve.sh
@@ -4,6 +4,7 @@ test_description='git merge
Testing the resolve strategy.'
+TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh
test_expect_success 'setup' '