From c22e7de340df2e0ebc0e98347aa02a32a459835f Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 23 Feb 2011 04:59:18 -0500 Subject: format-patch: rfc2047-encode newlines in headers 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 Signed-off-by: Junio C Hamano --- pretty.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pretty.c b/pretty.c index 0e167f463..65d20a7a2 100644 --- a/pretty.c +++ b/pretty.c @@ -228,7 +228,7 @@ static void add_rfc2047(struct strbuf *sb, const char *line, int len, for (i = 0; i < len; i++) { int ch = line[i]; - if (non_ascii(ch)) + if (non_ascii(ch) || ch == '\n') goto needquote; if ((i + 1 < len) && (ch == '=' && line[i+1] == '?')) goto needquote; @@ -254,7 +254,7 @@ needquote: * many programs do not understand this and just * leave the underscore in place. */ - if (is_rfc2047_special(ch) || ch == ' ') { + if (is_rfc2047_special(ch) || ch == ' ' || ch == '\n') { strbuf_addf(sb, "=%02X", ch); line_len += 3; } -- cgit v1.2.1