Merge branch 'jk/format-person-part-buffer-limit'

Avoid buffer overflow in format_person_part() function
git-mirror · May 25, 2012 · 9972c8e · 9972c8e
2 parents 407abba + c9b4e9e
commit 9972c8e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pretty.c b/pretty.c
@@ -550,8 +550,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);