[PATCH 3/3] format-patch: rfc2047-encode newlines in headers
- From
Jeff King <peff@peff.net>
- Date
- Feb 23, 2011, 09:59 UTC
- Message-ID
- <20110223095917.GC9222@sigill.intra.peff.net>
- In-Reply-To
- <20110223094844.GA9205@sigill.intra.peff.net>
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> --- pretty.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/pretty.c b/pretty.c index 0e167f4..65d20a7 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; }
-- 1.7.2.5.15.gfdd1c