[PATCH] mailinfo: don't decode invalid =XY quoted-printable sequences
- From
René Scharfe <l.s.r@web.de>
- Date
- Sep 23, 2017, 18:04 UTC
- Message-ID
- <d48b3d67-5f03-19f3-5a32-ec7e8397c98d@web.de>
Decode =XY in quoted-printable segments only if X and Y are hexadecimal digits, otherwise just copy them. That's at least better than interpreting negative results from hexval() as a character.
Signed-off-by: Rene Scharfe <l.s.r@web.de> --- mailinfo.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/mailinfo.c b/mailinfo.c index f2387a3267..3d8ac07399 100644 --- a/mailinfo.c +++ b/mailinfo.c @@ -367,11 +367,16 @@ static struct strbuf *decode_q_segment(const struct strbuf *q_seg, int rfc2047) while ((c = *in++) != 0) { if (c == '=') { - int d = *in++; + int ch, d = *in; if (d == '\n' || !d) break; /* drop trailing newline */ - strbuf_addch(out, (hexval(d) << 4) | hexval(*in++)); - continue; + ch = hex2chr(in); + if (ch >= 0) { + strbuf_addch(out, ch); + in += 2; + continue; + } + /* garbage -- fall through */ } if (rfc2047 && c == '_') /* rfc2047 4.2 (2) */ c = 0x20;
-- 2.14.1