We have an execution path in apply_data that leaks the local struct
image. Plug it.
This leak can be triggered with:
$ echo foo >file
$ git add file && git commit -m file
$ echo bar >file
$ git diff file >diff
$ sed s/foo/frotz/ <diff >baddiff
$ git apply --cached <baddiff
Fixing this leak allows us to mark as leak-free the following tests:
+ t2016-checkout-patch.sh
+ t4103-apply-binary.sh
+ t4104-apply-boundary.sh
+ t4113-apply-ending.sh
+ t4117-apply-reject.sh
+ t4123-apply-shrink.sh
+ t4252-am-options.sh
+ t4258-am-quoted-cr.sh
Mark them with "TEST_PASSES_SANITIZE_LEAK=true" to notice and fix
promply any new leak that may be introduced and triggered by them in the
future.
Signed-off-by: Rubén Justo <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Rubén Justo committedApr 23, 2024 at 00:54 UTC71c791605365d1873ef631bfc478fcd75080a063
9 files changed+12-1
apply.c
+3-1
index 34f20326a7..2f752d71a8 100644--- a/apply.c+++ b/apply.c@@ -3712,8 +3712,10 @@ static int apply_data(struct apply_state *state, struct patch *patch, fprintf(stderr, _("Falling back to direct application...\n")); /* Note: with --reject, apply_fragments() returns 0 */- if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0)+ if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0) {+ clear_image(&image); return -1;+ } } patch->result = image.buf; patch->resultsize = image.len;
index 71ef4132d1..dc501aac38 100755--- a/t/t4104-apply-boundary.sh+++ b/t/t4104-apply-boundary.sh@@ -5,6 +5,7 @@ test_description='git apply boundary tests'+TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh L="c d e f g h i j k l m n o p q r s t u v w x"
t/t4113-apply-ending.sh
+1
index 66fa51591e..2c65c6a169 100755--- a/t/t4113-apply-ending.sh+++ b/t/t4113-apply-ending.sh@@ -6,6 +6,7 @@ test_description='git apply trying to add an ending line. '+TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh # setup
t/t4117-apply-reject.sh
+1
index c86d05a96f..4d15ccd28e 100755--- a/t/t4117-apply-reject.sh+++ b/t/t4117-apply-reject.sh@@ -7,6 +7,7 @@ test_description='git apply with rejects '+TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh test_expect_success setup '
t/t4123-apply-shrink.sh
+1
index 3ef84619f5..3601c0c5dc 100755--- a/t/t4123-apply-shrink.sh+++ b/t/t4123-apply-shrink.sh@@ -2,6 +2,7 @@ test_description='apply a patch that is larger than the preimage'+TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh cat >F <<\EOF
t/t4252-am-options.sh
+2
index e758e634a3..5b680dc755 100755--- a/t/t4252-am-options.sh+++ b/t/t4252-am-options.sh@@ -1,6 +1,8 @@ #!/bin/sh test_description='git am with options and not losing them'++TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh tm="$TEST_DIRECTORY/t4252"
t/t4258-am-quoted-cr.sh
+1
index 201915b45a..3573c9147f 100755--- a/t/t4258-am-quoted-cr.sh+++ b/t/t4258-am-quoted-cr.sh@@ -2,6 +2,7 @@ test_description='test am --quoted-cr=<action>'+TEST_PASSES_SANITIZE_LEAK=true . ./test-lib.sh DATA="$TEST_DIRECTORY/t4258"