kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

mailinfo: disallow NUL character in mail's header 

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Đoàn Trần Công Danh 2020-04-21 06:54:36 +07:00 committed by Junio C Hamano
parent 2a2ff60396
commit 3919997447
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mailinfo.c
View File

@ -1138,6 +1138,11 @@ static void handle_info(struct mailinfo *mi)
else else
continue; continue;


if (memchr(hdr->buf, '\0', hdr->len)) {
error("a NUL byte in '%s' is not allowed.", header[i]);
mi->input_error = -1;
}

if (!strcmp(header[i], "Subject")) { if (!strcmp(header[i], "Subject")) {
if (!mi->keep_subject) { if (!mi->keep_subject) {
cleanup_subject(mi, hdr); cleanup_subject(mi, hdr);

7
t/t4254-am-corrupt.sh
View File

@ -70,10 +70,13 @@ test_expect_success "NUL in commit message's body" '
grep "a NUL byte in commit log message not allowed" err grep "a NUL byte in commit log message not allowed" err
' '


test_expect_failure "NUL in commit message's header" " test_expect_success "NUL in commit message's header" "
test_when_finished 'git am --abort' && test_when_finished 'git am --abort' &&
make_mbox_with_nul subject >subject.patch && make_mbox_with_nul subject >subject.patch &&
test_must_fail git am subject.patch test_must_fail git mailinfo msg patch <subject.patch 2>err &&
grep \"a NUL byte in 'Subject' is not allowed\" err &&
test_must_fail git am subject.patch 2>err &&
grep \"a NUL byte in 'Subject' is not allowed\" err
" "


test_done test_done