admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mailmap: fix check-mailmap with full mailmap line

Browse Source 
I recently had reported to me a crash from a coworker using the recently
added sendemail mailmap support:

  3724814 Segmentation fault      (core dumped) git check-mailmap "bugs@company.xx"

This appears to happen because of the NULL pointer name passed into
map_user(). Fix this by passing "" instead of NULL so that we have a
valid pointer.

Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jacob Keller
2025-02-21 15:47:58 -08:00
committed by Junio C Hamano
parent e1fbebe347
commit bb60c52131
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/check-mailmap.c
View File

@@ -35,7 +35,7 @@ static void check_mailmap(struct string_list *mailmap, const char *contact)
mail = ident.mail_begin; mail = ident.mail_begin;
maillen = ident.mail_end - ident.mail_begin; maillen = ident.mail_end - ident.mail_begin;
} else { } else {
name = NULL; name = "";
namelen = 0; namelen = 0;
mail = contact; mail = contact;
maillen = strlen(contact); maillen = strlen(contact);

12
t/t4203-mailmap.sh
View File

@@ -114,6 +114,18 @@ test_expect_success 'check-mailmap --stdin simple address: no mapping' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'check-mailmap name and address: mapping' '
test_when_finished "rm .mailmap" &&
cat >.mailmap <<-EOF &&
Bug Reports <bugs-new@company.xx> Bugs <bugs@company.xx>
EOF
cat >expect <<-EOF &&
<bugs@company.xx>
EOF
git check-mailmap "bugs@company.xx" >actual &&
test_cmp expect actual
'
test_expect_success 'No mailmap' ' test_expect_success 'No mailmap' '
cat >expect <<-EOF && cat >expect <<-EOF &&
$GIT_AUTHOR_NAME (1): $GIT_AUTHOR_NAME (1):