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

mailinfo: treat header values as C strings

Browse Source 
We read each header line into a strbuf, which means that we could
in theory handle header values with embedded NUL bytes. But in practice,
the values we parse out are passed to decode_header(), which uses
strstr(), strchr(), etc. And we would not expect such bytes anyway; they
are forbidden by RFC822, etc. and any non-ASCII characters should be
encoded with RFC2047 encoding.

So let's switch to using strbuf_addstr(), which saves us some length
computations (and will enable further cleanups in this code).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2020-02-11 12:18:52 -05:00
committed by Junio C Hamano
parent 517b60564e
commit b6537d83ee
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mailinfo.c
View File

@ -557,7 +557,7 @@ static int check_header(struct mailinfo *mi,
/* Unwrap inline B and Q encoding, and optionally /* Unwrap inline B and Q encoding, and optionally
* normalize the meta information to utf8. * normalize the meta information to utf8.
*/ */
strbuf_add(&sb, line->buf + len + 2, line->len - len - 2); strbuf_addstr(&sb, line->buf + len + 2);
decode_header(mi, &sb); decode_header(mi, &sb);
handle_header(&hdr_data[i], &sb); handle_header(&hdr_data[i], &sb);
ret = 1; ret = 1;
@ -568,7 +568,7 @@ static int check_header(struct mailinfo *mi,
/* Content stuff */ /* Content stuff */
if (cmp_header(line, "Content-Type")) { if (cmp_header(line, "Content-Type")) {
len = strlen("Content-Type: "); len = strlen("Content-Type: ");
strbuf_add(&sb, line->buf + len, line->len - len); strbuf_addstr(&sb, line->buf + len);
decode_header(mi, &sb); decode_header(mi, &sb);
handle_content_type(mi, &sb); handle_content_type(mi, &sb);
ret = 1; ret = 1;
@ -576,7 +576,7 @@ static int check_header(struct mailinfo *mi,
} }
if (cmp_header(line, "Content-Transfer-Encoding")) { if (cmp_header(line, "Content-Transfer-Encoding")) {
len = strlen("Content-Transfer-Encoding: "); len = strlen("Content-Transfer-Encoding: ");
strbuf_add(&sb, line->buf + len, line->len - len); strbuf_addstr(&sb, line->buf + len);
decode_header(mi, &sb); decode_header(mi, &sb);
handle_content_transfer_encoding(mi, &sb); handle_content_transfer_encoding(mi, &sb);
ret = 1; ret = 1;
@ -584,7 +584,7 @@ static int check_header(struct mailinfo *mi,
} }
if (cmp_header(line, "Message-Id")) { if (cmp_header(line, "Message-Id")) {
len = strlen("Message-Id: "); len = strlen("Message-Id: ");
strbuf_add(&sb, line->buf + len, line->len - len); strbuf_addstr(&sb, line->buf + len);
decode_header(mi, &sb); decode_header(mi, &sb);
if (mi->add_message_id) if (mi->add_message_id)
mi->message_id = strbuf_detach(&sb, NULL); mi->message_id = strbuf_detach(&sb, NULL);