mirror of
https://github.com/git/git.git
synced 2024-11-08 18:23:01 +01:00
e9d7d10a7f
In handle_from, we calculate the end boundary of a section to remove from a strbuf using strcspn like this: el = strcspn(buf, set_of_end_boundaries); strbuf_remove(&sb, start, el + 1); This works fine if "el" is the offset of the boundary character, meaning we remove up to and including that character. But if the end boundary didn't match (that is, we hit the end of the string as the boundary instead) then we want just "el". Asking for "el+1" caught an out-of-bounds assertion in the strbuf library. This manifested itself when we got a 'From' header that had just an email address with nothing else in it (the end of the string was the end of the address, rather than, e.g., a trailing '>' character), causing git-mailinfo to barf. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
57 lines
1.3 KiB
Bash
Executable file
57 lines
1.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git mailinfo and git mailsplit test'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'split sample box' \
|
|
'git mailsplit -o. ../t5100/sample.mbox >last &&
|
|
last=`cat last` &&
|
|
echo total is $last &&
|
|
test `cat last` = 11'
|
|
|
|
for mail in `echo 00*`
|
|
do
|
|
test_expect_success "mailinfo $mail" \
|
|
"git mailinfo -u msg$mail patch$mail <$mail >info$mail &&
|
|
echo msg &&
|
|
diff ../t5100/msg$mail msg$mail &&
|
|
echo patch &&
|
|
diff ../t5100/patch$mail patch$mail &&
|
|
echo info &&
|
|
diff ../t5100/info$mail info$mail"
|
|
done
|
|
|
|
test_expect_success 'respect NULs' '
|
|
|
|
git mailsplit -d3 -o. ../t5100/nul-plain &&
|
|
cmp ../t5100/nul-plain 001 &&
|
|
(cat 001 | git mailinfo msg patch) &&
|
|
test 4 = $(wc -l < patch)
|
|
|
|
'
|
|
|
|
test_expect_success 'Preserve NULs out of MIME encoded message' '
|
|
|
|
git mailsplit -d5 -o. ../t5100/nul-b64.in &&
|
|
cmp ../t5100/nul-b64.in 00001 &&
|
|
git mailinfo msg patch <00001 &&
|
|
cmp ../t5100/nul-b64.expect patch
|
|
|
|
'
|
|
|
|
test_expect_success 'mailinfo on from header without name works' '
|
|
|
|
mkdir info-from &&
|
|
git mailsplit -oinfo-from "$TEST_DIRECTORY"/t5100/info-from.in &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/info-from.in info-from/0001 &&
|
|
git mailinfo info-from/msg info-from/patch \
|
|
<info-from/0001 >info-from/out &&
|
|
test_cmp "$TEST_DIRECTORY"/t5100/info-from.expect info-from/out
|
|
|
|
'
|
|
|
|
test_done
|