mirror of
https://github.com/git/git.git
synced 2024-05-30 03:16:31 +02:00
d1bd3a8c34
When processing a header like a "From" line, mailinfo uses unquote_quoted_pair() to handle double-quotes and rfc822 parenthesized comments. It takes a NUL-terminated string on input, and loops over the "in" pointer until it sees the NUL. When it finds the start of an interesting block, it delegates to helper functions which also increment "in", and return the updated pointer. But there's a bug here: the helpers find the NUL with a post-increment in the loop condition, like: while ((c = *in++) != 0) So when they do see a NUL (rather than the correct termination of the quote or comment section), they return "in" as one _past_ the NUL terminator. And thus the outer loop in unquote_quoted_pair() does not realize we hit the NUL, and keeps reading past the end of the buffer. We should instead make sure to return "in" positioned at the NUL, so that the caller knows to stop their loop, too. A hacky way to do this is to return "in - 1" after leaving the inner loop. But a slightly cleaner solution is to avoid incrementing "in" until we are sure it contained a non-NUL byte (i.e., doing it inside the loop body). The two tests here show off the problem. Since we check the output, they'll _usually_ report a failure in a normal build, but it depends on what garbage bytes are found after the heap buffer. Building with SANITIZE=address reliably notices the problem. The outcome (both the exit code and the exact bytes) are just what Git happens to produce for these cases today, and shouldn't be taken as an endorsement. It might be reasonable to abort on an unterminated string, for example. The priority for this patch is fixing the out-of-bounds memory access. Reported-by: Carlos Andrés Ramírez Cataño <antaigroupltda@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
294 lines
8.2 KiB
Bash
Executable File
294 lines
8.2 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git mailinfo and git mailsplit test'
|
|
|
|
. ./test-lib.sh
|
|
|
|
DATA="$TEST_DIRECTORY/t5100"
|
|
|
|
test_expect_success 'split sample box' \
|
|
'git mailsplit -o. "$DATA/sample.mbox" >last &&
|
|
last=$(cat last) &&
|
|
echo total is $last &&
|
|
test $(cat last) = 18'
|
|
|
|
check_mailinfo () {
|
|
mail=$1 opt=$2
|
|
mo="$mail$opt"
|
|
git mailinfo -u $opt "msg$mo" "patch$mo" <"$mail" >"info$mo" &&
|
|
test_cmp "$DATA/msg$mo" "msg$mo" &&
|
|
test_cmp "$DATA/patch$mo" "patch$mo" &&
|
|
test_cmp "$DATA/info$mo" "info$mo"
|
|
}
|
|
|
|
|
|
for mail in 00*
|
|
do
|
|
test_expect_success "mailinfo $mail" '
|
|
check_mailinfo "$mail" "" &&
|
|
if test -f "$DATA/msg$mail--scissors"
|
|
then
|
|
check_mailinfo "$mail" --scissors
|
|
fi &&
|
|
if test -f "$DATA/msg$mail--no-inbody-headers"
|
|
then
|
|
check_mailinfo "$mail" --no-inbody-headers
|
|
fi &&
|
|
if test -f "$DATA/msg$mail--message-id"
|
|
then
|
|
check_mailinfo "$mail" --message-id
|
|
fi
|
|
'
|
|
done
|
|
|
|
|
|
test_expect_success 'split box with rfc2047 samples' \
|
|
'mkdir rfc2047 &&
|
|
git mailsplit -orfc2047 "$DATA/rfc2047-samples.mbox" \
|
|
>rfc2047/last &&
|
|
last=$(cat rfc2047/last) &&
|
|
echo total is $last &&
|
|
test $(cat rfc2047/last) = 11'
|
|
|
|
for mail in rfc2047/00*
|
|
do
|
|
test_expect_success "mailinfo $mail" '
|
|
git mailinfo -u "$mail-msg" "$mail-patch" <"$mail" >"$mail-info" &&
|
|
echo msg &&
|
|
test_cmp "$DATA/empty" "$mail-msg" &&
|
|
echo patch &&
|
|
test_cmp "$DATA/empty" "$mail-patch" &&
|
|
echo info &&
|
|
test_cmp "$DATA/rfc2047-info-$(basename $mail)" "$mail-info"
|
|
'
|
|
done
|
|
|
|
test_expect_success 'respect NULs' '
|
|
|
|
git mailsplit -d3 -o. "$DATA/nul-plain" &&
|
|
test_cmp "$DATA/nul-plain" 001 &&
|
|
(cat 001 | git mailinfo msg patch) &&
|
|
test_line_count = 4 patch
|
|
|
|
'
|
|
|
|
test_expect_success 'Preserve NULs out of MIME encoded message' '
|
|
|
|
git mailsplit -d5 -o. "$DATA/nul-b64.in" &&
|
|
test_cmp "$DATA/nul-b64.in" 00001 &&
|
|
git mailinfo msg patch <00001 &&
|
|
test_cmp "$DATA/nul-b64.expect" patch
|
|
|
|
'
|
|
|
|
test_expect_success 'mailinfo on from header without name works' '
|
|
|
|
mkdir info-from &&
|
|
git mailsplit -oinfo-from "$DATA/info-from.in" &&
|
|
test_cmp "$DATA/info-from.in" info-from/0001 &&
|
|
git mailinfo info-from/msg info-from/patch \
|
|
<info-from/0001 >info-from/out &&
|
|
test_cmp "$DATA/info-from.expect" info-from/out
|
|
|
|
'
|
|
|
|
test_expect_success 'mailinfo finds headers after embedded From line' '
|
|
mkdir embed-from &&
|
|
git mailsplit -oembed-from "$DATA/embed-from.in" &&
|
|
test_cmp "$DATA/embed-from.in" embed-from/0001 &&
|
|
git mailinfo embed-from/msg embed-from/patch \
|
|
<embed-from/0001 >embed-from/out &&
|
|
test_cmp "$DATA/embed-from.expect" embed-from/out
|
|
'
|
|
|
|
test_expect_success 'mailinfo on message with quoted >From' '
|
|
mkdir quoted-from &&
|
|
git mailsplit -oquoted-from "$DATA/quoted-from.in" &&
|
|
test_cmp "$DATA/quoted-from.in" quoted-from/0001 &&
|
|
git mailinfo quoted-from/msg quoted-from/patch \
|
|
<quoted-from/0001 >quoted-from/out &&
|
|
test_cmp "$DATA/quoted-from.expect" quoted-from/msg
|
|
'
|
|
|
|
test_expect_success 'mailinfo unescapes with --mboxrd' '
|
|
mkdir mboxrd &&
|
|
git mailsplit -omboxrd --mboxrd \
|
|
"$DATA/sample.mboxrd" >last &&
|
|
test x"$(cat last)" = x2 &&
|
|
for i in 0001 0002
|
|
do
|
|
git mailinfo mboxrd/msg mboxrd/patch \
|
|
<mboxrd/$i >mboxrd/out &&
|
|
test_cmp "$DATA/${i}mboxrd" mboxrd/msg || return 1
|
|
done &&
|
|
sp=" " &&
|
|
echo "From " >expect &&
|
|
echo "From " >>expect &&
|
|
echo >> expect &&
|
|
cat >sp <<-INPUT_END &&
|
|
From mboxrd Mon Sep 17 00:00:00 2001
|
|
From: trailing spacer <sp@example.com>
|
|
Subject: [PATCH] a commit with trailing space
|
|
|
|
From$sp
|
|
>From$sp
|
|
|
|
INPUT_END
|
|
|
|
git mailsplit -f2 -omboxrd --mboxrd <sp >last &&
|
|
test x"$(cat last)" = x1 &&
|
|
git mailinfo mboxrd/msg mboxrd/patch <mboxrd/0003 &&
|
|
test_cmp expect mboxrd/msg
|
|
'
|
|
|
|
test_expect_success 'mailinfo handles rfc2822 quoted-string' '
|
|
mkdir quoted-string &&
|
|
git mailinfo /dev/null /dev/null <"$DATA/quoted-string.in" \
|
|
>quoted-string/info &&
|
|
test_cmp "$DATA/quoted-string.expect" quoted-string/info
|
|
'
|
|
|
|
test_expect_success 'mailinfo handles rfc2822 comment' '
|
|
mkdir comment &&
|
|
git mailinfo /dev/null /dev/null <"$DATA/comment.in" \
|
|
>comment/info &&
|
|
test_cmp "$DATA/comment.expect" comment/info
|
|
'
|
|
|
|
test_expect_success 'mailinfo with mailinfo.scissors config' '
|
|
test_config mailinfo.scissors true &&
|
|
(
|
|
mkdir sub &&
|
|
cd sub &&
|
|
git mailinfo ../msg0014.sc ../patch0014.sc <../0014 >../info0014.sc
|
|
) &&
|
|
test_cmp "$DATA/msg0014--scissors" msg0014.sc &&
|
|
test_cmp "$DATA/patch0014--scissors" patch0014.sc &&
|
|
test_cmp "$DATA/info0014--scissors" info0014.sc
|
|
'
|
|
|
|
|
|
test_expect_success 'mailinfo no options' '
|
|
subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
|
|
git mailinfo /dev/null /dev/null)" &&
|
|
test z"$subj" = z"Subject: message"
|
|
'
|
|
|
|
test_expect_success 'mailinfo -k' '
|
|
subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
|
|
git mailinfo -k /dev/null /dev/null)" &&
|
|
test z"$subj" = z"Subject: [PATCH] [other] [PATCH] message"
|
|
'
|
|
|
|
test_expect_success 'mailinfo -b no [PATCH]' '
|
|
subj="$(echo "Subject: [other] message" |
|
|
git mailinfo -b /dev/null /dev/null)" &&
|
|
test z"$subj" = z"Subject: [other] message"
|
|
'
|
|
|
|
test_expect_success 'mailinfo -b leading [PATCH]' '
|
|
subj="$(echo "Subject: [PATCH] [other] message" |
|
|
git mailinfo -b /dev/null /dev/null)" &&
|
|
test z"$subj" = z"Subject: [other] message"
|
|
'
|
|
|
|
test_expect_success 'mailinfo -b double [PATCH]' '
|
|
subj="$(echo "Subject: [PATCH] [PATCH] message" |
|
|
git mailinfo -b /dev/null /dev/null)" &&
|
|
test z"$subj" = z"Subject: message"
|
|
'
|
|
|
|
test_expect_success 'mailinfo -b trailing [PATCH]' '
|
|
subj="$(echo "Subject: [other] [PATCH] message" |
|
|
git mailinfo -b /dev/null /dev/null)" &&
|
|
test z"$subj" = z"Subject: [other] message"
|
|
'
|
|
|
|
test_expect_success 'mailinfo -b separated double [PATCH]' '
|
|
subj="$(echo "Subject: [PATCH] [other] [PATCH] message" |
|
|
git mailinfo -b /dev/null /dev/null)" &&
|
|
test z"$subj" = z"Subject: [other] message"
|
|
'
|
|
|
|
test_expect_success 'mailinfo handles unusual header whitespace' '
|
|
git mailinfo /dev/null /dev/null >actual <<-\EOF &&
|
|
From:Real Name <user@example.com>
|
|
Subject: extra spaces
|
|
EOF
|
|
|
|
cat >expect <<-\EOF &&
|
|
Author: Real Name
|
|
Email: user@example.com
|
|
Subject: extra spaces
|
|
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
check_quoted_cr_mail () {
|
|
mail="$1" && shift &&
|
|
git mailinfo -u "$@" "$mail.msg" "$mail.patch" \
|
|
<"$mail" >"$mail.info" 2>"$mail.err" &&
|
|
test_cmp "$mail-expected.msg" "$mail.msg" &&
|
|
test_cmp "$mail-expected.patch" "$mail.patch" &&
|
|
test_cmp "$DATA/quoted-cr-info" "$mail.info"
|
|
}
|
|
|
|
test_expect_success 'split base64 email with quoted-cr' '
|
|
mkdir quoted-cr &&
|
|
git mailsplit -oquoted-cr "$DATA/quoted-cr.mbox" >quoted-cr/last &&
|
|
test $(cat quoted-cr/last) = 2
|
|
'
|
|
|
|
test_expect_success 'mailinfo warn CR in base64 encoded email' '
|
|
sed -e "s/%%$//" -e "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-msg" \
|
|
>quoted-cr/0001-expected.msg &&
|
|
sed "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-msg" \
|
|
>quoted-cr/0002-expected.msg &&
|
|
sed -e "s/%%$//" -e "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-patch" \
|
|
>quoted-cr/0001-expected.patch &&
|
|
sed "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-patch" \
|
|
>quoted-cr/0002-expected.patch &&
|
|
check_quoted_cr_mail quoted-cr/0001 &&
|
|
test_must_be_empty quoted-cr/0001.err &&
|
|
check_quoted_cr_mail quoted-cr/0002 &&
|
|
grep "quoted CRLF detected" quoted-cr/0002.err &&
|
|
check_quoted_cr_mail quoted-cr/0001 --quoted-cr=nowarn &&
|
|
test_must_be_empty quoted-cr/0001.err &&
|
|
check_quoted_cr_mail quoted-cr/0002 --quoted-cr=nowarn &&
|
|
test_must_be_empty quoted-cr/0002.err &&
|
|
cp quoted-cr/0001-expected.msg quoted-cr/0002-expected.msg &&
|
|
cp quoted-cr/0001-expected.patch quoted-cr/0002-expected.patch &&
|
|
check_quoted_cr_mail quoted-cr/0001 --quoted-cr=strip &&
|
|
test_must_be_empty quoted-cr/0001.err &&
|
|
check_quoted_cr_mail quoted-cr/0002 --quoted-cr=strip &&
|
|
test_must_be_empty quoted-cr/0002.err
|
|
'
|
|
|
|
test_expect_success 'from line with unterminated quoted string' '
|
|
echo "From: bob \"unterminated string smith <bob@example.com>" >in &&
|
|
git mailinfo /dev/null /dev/null <in >actual &&
|
|
cat >expect <<-\EOF &&
|
|
Author: bob unterminated string smith
|
|
Email: bob@example.com
|
|
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'from line with unterminated comment' '
|
|
echo "From: bob (unterminated comment smith <bob@example.com>" >in &&
|
|
git mailinfo /dev/null /dev/null <in >actual &&
|
|
cat >expect <<-\EOF &&
|
|
Author: bob (unterminated comment smith
|
|
Email: bob@example.com
|
|
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|