From 85370a6ce83c9bdf861d3377721952f5fbf8b8cd Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Tue, 20 Dec 2016 12:59:35 +0000 Subject: [Fix] Fix work with broken utf8 tokens --- src/libmime/mime_headers.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/libmime/mime_headers.c b/src/libmime/mime_headers.c index 27c427ae5..31a05c281 100644 --- a/src/libmime/mime_headers.c +++ b/src/libmime/mime_headers.c @@ -411,6 +411,11 @@ rspamd_mime_header_decode (rspamd_mempool_t *pool, const gchar *in, &tok_start, &tok_len)) { /* We have a token, so we can decode it from `encoding` */ if (token->len > 0) { + if (old_charset.len == 0) { + memcpy (&old_charset, &cur_charset, + sizeof (old_charset)); + } + rspamd_mime_header_maybe_save_token (pool, out, token, decoded, &old_charset, &cur_charset); -- cgit v1.2.3