diff options
| author | Christian Neukirchen <chneukirchen@gmail.com> | 2016-07-15 16:51:17 +0200 |
|---|---|---|
| committer | Christian Neukirchen <chneukirchen@gmail.com> | 2016-07-15 16:51:17 +0200 |
| commit | 54b93c8f639a151758541e5739ce8cdb84174395 (patch) | |
| tree | 825ed400dabff432be7ba7aaf3ccfe8413460cf4 /rfc2047.c | |
| parent | 8629e12ee6f31750f91c78cbdf4e9c45908ae4c3 (diff) | |
| download | mblaze-54b93c8f639a151758541e5739ce8cdb84174395.tar.gz mblaze-54b93c8f639a151758541e5739ce8cdb84174395.tar.xz mblaze-54b93c8f639a151758541e5739ce8cdb84174395.zip | |
rfc2047: decode ??? on errors
Diffstat (limited to 'rfc2047.c')
| -rw-r--r-- | rfc2047.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/rfc2047.c b/rfc2047.c index f942a46..e53a5ce 100644 --- a/rfc2047.c +++ b/rfc2047.c @@ -38,8 +38,12 @@ blaze822_decode_qp(char *start, char *stop, char **deco, size_t *decleno) unsigned char c1 = s[1]; unsigned char c2 = s[2]; s += 3; - if (c1 > 127 || c2 > 127 || hex[c1] < 0 || hex[c2] < 0) + if (c1 > 127 || c2 > 127 || hex[c1] < 0 || hex[c2] < 0) { + *buf++ = '?'; + *buf++ = '?'; + *buf++ = '?'; continue; + } *buf++ = (hex[c1] << 4) | hex[c2]; } else if (*s == '_') { *buf++ = ' '; @@ -88,15 +92,20 @@ blaze822_decode_b64(char *s, char *e, char **deco, size_t *decleno) s += 4; if ((c0 | c1 | c2 | c3) > 127) - continue; + goto error; v |= b64[c0]; t |= b64[c0]; v <<= 6; v |= b64[c1]; t |= b64[c1]; v <<= 6; v |= b64[c2]; t |= b64[c2]; v <<= 6; v |= b64[c3]; t |= b64[c3]; - if (t >= 64) + if (t >= 64) { +error: + *buf++ = '?'; + *buf++ = '?'; + *buf++ = '?'; continue; + } char d2 = v & 0xff; v >>= 8; char d1 = v & 0xff; v >>= 8; |