diff options
author | Kevin McCarthy <kevin@8t8.us> | 2023-09-03 12:22:01 +0800 |
---|---|---|
committer | Kevin McCarthy <kevin@8t8.us> | 2023-09-09 14:31:01 +0800 |
commit | 452ee330e094bfc7c9a68555e5152b1826534555 (patch) | |
tree | eb4adef173ed98a3edf28983074a939905902ac8 | |
parent | 7eb9c18f27d14f3fbdf4f844c1b683a659bc48aa (diff) |
Fix rfc2047 base64 decoding to abort on illegal characters.
For some reason, the rfc2047 base64 decoder ignored illegal
characters, instead of aborting. This seems innocuous, but in fact
leads to at least three crash-bugs elsewhere in Mutt.
These stem from Mutt, in some cases, passing an entire header
field (name, colon, and body) to the rfc2047 decoder. (It is
technically incorrect to do so, by the way, but is beyond scope for
these fixes in stable). Mutt then assumes the result can't be empty
because of a previous check that the header contains at least a colon.
This commit takes care of the source of the crashes, by aborting the
rfc2047 decode. The following two commits add protective fixes to the
specific crash points.
Thanks to Chenyuan Mi (@morningbread) for discovering the strchr
crashes, giving a working example draft message, and providing the
stack traces for the two NULL derefences.
-rw-r--r-- | rfc2047.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -724,7 +724,7 @@ static int rfc2047_decode_word (BUFFER *d, const char *s, char **charset) if (*pp == '=') break; if ((*pp & ~127) || (c = base64val(*pp)) == -1) - continue; + goto error_out_0; if (k + 6 >= 8) { k -= 2; |