[Fix] Fix work with broken utf8 tokens

diff --git a/src/libmime/mime_headers.c b/src/libmime/mime_headers.c
index 27c427ae5fa03abfd17cc6c9abb20103d698a472..31a05c2818f7a4dfee30f0b890114ff7111669ab 100644 (file)
--- 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);