undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format-patch: rfc2047-encode newlines in headers

Browse Source 
These should generally never happen, as we already
concatenate multiples in subjects into a single line. But
let's be defensive, since not encoding them means we will
output malformed headers.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2011-02-23 04:59:18 -05:00 committed by Junio C Hamano
parent a1f6baa5c9
commit c22e7de340
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pretty.c
View File

@ -228,7 +228,7 @@ static void add_rfc2047(struct strbuf *sb, const char *line, int len,
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
int ch = line[i]; int ch = line[i];
if (non_ascii(ch)) if (non_ascii(ch) || ch == '\n')
goto needquote; goto needquote;
if ((i + 1 < len) && (ch == '=' && line[i+1] == '?')) if ((i + 1 < len) && (ch == '=' && line[i+1] == '?'))
goto needquote; goto needquote;
@ -254,7 +254,7 @@ needquote:
* many programs do not understand this and just * many programs do not understand this and just
* leave the underscore in place. * leave the underscore in place.
*/ */
if (is_rfc2047_special(ch) || ch == ' ') { if (is_rfc2047_special(ch) || ch == ' ' || ch == '\n') {
strbuf_addf(sb, "=%02X", ch); strbuf_addf(sb, "=%02X", ch);
line_len += 3; line_len += 3;
} }