3 test_description
='git am with corrupt input'
5 TEST_PASSES_SANITIZE_LEAK
=true
8 if ! test_have_prereq ICONV
10 skip_all
='skipping am encoding corruption tests; iconv not available'
14 make_mbox_with_nul
() {
21 subject
) q_nul_in_subject
='=00' ;;
22 body
) q_nul_in_body
='=00' ;;
27 From ec7364544f690c560304f5a5de9428ea3b978b26 Mon Sep 17 00:00:00 2001
28 From: A U Thor <author@example.com>
29 Date: Sun, 19 Apr 2020 13:42:07 +0700
30 Subject: [PATCH] =?ISO-8859-1?q?=C4=CB${q_nul_in_subject}=D1=CF=D6?=
32 Content-Type: text/plain; charset=ISO-8859-1
33 Content-Transfer-Encoding: quoted-printable
35 abc${q_nul_in_body}def
37 diff --git a/afile b/afile
39 index 0000000000..e69de29bb2
45 test_expect_success setup
'
46 # Note the missing "+++" line:
47 cat >bad-patch.diff <<-\EOF &&
48 From: A U Thor <au.thor@example.com>
50 index 7898192..6178079 100644
63 # This used to fail before, too, but with a different diagnostic.
64 # fatal: unable to write file '(null)' mode 100644: Bad address
65 # Also, it had the unwanted side-effect of deleting f.
66 test_expect_success
'try to apply corrupted patch' '
67 test_when_finished "git am --abort" &&
68 test_must_fail git -c advice.amWorkDir=false -c advice.mergeConflict=false am bad-patch.diff 2>actual &&
69 echo "error: git diff header lacks filename information (line 4)" >expected &&
70 test_path_is_file f &&
71 test_cmp expected actual
74 test_expect_success
"NUL in commit message's body" '
75 test_when_finished "git am --abort" &&
76 make_mbox_with_nul body >body.patch &&
77 test_must_fail git am body.patch 2>err &&
78 grep "a NUL byte in commit log message not allowed" err
81 test_expect_success
"NUL in commit message's header" "
82 test_when_finished 'git am --abort' &&
83 make_mbox_with_nul subject >subject.patch &&
84 test_must_fail git mailinfo msg patch <subject.patch 2>err &&
85 grep \"a NUL byte in 'Subject' is not allowed\" err &&
86 test_must_fail git am subject.patch 2>err &&
87 grep \"a NUL byte in 'Subject' is not allowed\" err