Skip to content

Commit

Permalink
Merge branch 'jk/format-person-part-buffer-limit' into maint
Browse files Browse the repository at this point in the history
By Jeff King
* jk/format-person-part-buffer-limit:
  pretty: avoid buffer overflow in format_person_part
  • Loading branch information
Junio C Hamano committed Jun 1, 2012
2 parents 63cdf16 + c9b4e9e commit 92ddfaa
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions pretty.c
Original file line number Diff line number Diff line change
Expand Up @@ -547,8 +547,10 @@ static size_t format_person_part(struct strbuf *sb, char part,
mail_end = s.mail_end;

if (part == 'N' || part == 'E') { /* mailmap lookup */
strlcpy(person_name, name_start, name_end - name_start + 1);
strlcpy(person_mail, mail_start, mail_end - mail_start + 1);
snprintf(person_name, sizeof(person_name), "%.*s",
(int)(name_end - name_start), name_start);
snprintf(person_mail, sizeof(person_mail), "%.*s",
(int)(mail_end - mail_start), mail_start);
mailmap_name(person_mail, sizeof(person_mail), person_name, sizeof(person_name));
name_start = person_name;
name_end = name_start + strlen(person_name);
Expand Down

0 comments on commit 92ddfaa

Please sign in to comment.