Skip to content

Commit

Permalink
Merge branch 'rs/mailinfo-header-cmp' into maint
Browse files Browse the repository at this point in the history
"git mailinfo" used to read beyond the end of header string while
parsing an incoming e-mail message to extract the patch.

* rs/mailinfo-header-cmp:
  mailinfo: use strcmp() for string comparison
  • Loading branch information
Junio C Hamano committed Jun 25, 2014
2 parents 182c3d6 + b1a013d commit ed5d0d2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions builtin/mailinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ static int check_header(const struct strbuf *line,
}
if (starts_with(line->buf, "[PATCH]") && isspace(line->buf[7])) {
for (i = 0; header[i]; i++) {
if (!memcmp("Subject", header[i], 7)) {
if (!strcmp("Subject", header[i])) {
handle_header(&hdr_data[i], line);
ret = 1;
goto check_header_out;
Expand Down Expand Up @@ -929,13 +929,13 @@ static void handle_info(void)
else
continue;

if (!memcmp(header[i], "Subject", 7)) {
if (!strcmp(header[i], "Subject")) {
if (!keep_subject) {
cleanup_subject(hdr);
cleanup_space(hdr);
}
output_header_lines(fout, "Subject", hdr);
} else if (!memcmp(header[i], "From", 4)) {
} else if (!strcmp(header[i], "From")) {
cleanup_space(hdr);
handle_from(hdr);
fprintf(fout, "Author: %s\n", name.buf);
Expand Down

0 comments on commit ed5d0d2

Please sign in to comment.