diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-12-06 20:25:42 +0000 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2018-01-25 20:20:49 +0200 |
| commit | d8c2d8d71a6143bac3594fd398605838cca65522 (patch) | |
| tree | 6f69c1c030a33c987e34b7fc5946db61a7035c0d | |
| parent | b6d2be10423d78673d073896d7bc4e491beb965e (diff) | |
| download | rspamd-d8c2d8d71a6143bac3594fd398605838cca65522.tar.gz rspamd-d8c2d8d71a6143bac3594fd398605838cca65522.zip | |
[Fix] Check decoded headers sanity (e.g. by excluding \0)
MFH: rspamd-1.6
| -rw-r--r-- | src/libmime/mime_headers.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/libmime/mime_headers.c b/src/libmime/mime_headers.c index 09c892719..63568e230 100644 --- a/src/libmime/mime_headers.c +++ b/src/libmime/mime_headers.c @@ -508,6 +508,20 @@ rspamd_mime_header_maybe_save_token (rspamd_mempool_t *pool, GString *out, memcpy (old_charset, new_charset, sizeof (*old_charset)); } +static void +rspamd_mime_header_sanity_check (GString *str) +{ + gsize i; + gchar t; + + for (i = 0; i < str->len; i ++) { + t = str->str[i]; + if (!((t & 0x80) || g_ascii_isgraph (t) || t == ' ')) { + str->str[i] = '?'; + } + } +} + gchar * rspamd_mime_header_decode (rspamd_mempool_t *pool, const gchar *in, gsize inlen) @@ -686,6 +700,7 @@ rspamd_mime_header_decode (rspamd_mempool_t *pool, const gchar *in, g_byte_array_free (token, TRUE); g_byte_array_free (decoded, TRUE); + rspamd_mime_header_sanity_check (out); ret = g_string_free (out, FALSE); rspamd_mempool_add_destructor (pool, g_free, ret); |