From: Timo Sirainen <tss@iki.fi>
Date: Sat, 16 May 2015 21:51:50 +0000 (+0300)
Subject: lib-mail: Make sure iconv state is reset between MIME parts.
X-Git-Tag: 2.2.19.rc1~473
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d7ec47e669516fe224e61a4f778b8db48fd55ef;p=thirdparty%2Fdovecot%2Fcore.git

lib-mail: Make sure iconv state is reset between MIME parts.
---

diff --git a/src/lib-mail/message-decoder.c b/src/lib-mail/message-decoder.c
index 4c16526f44..2cb8bb1b0e 100644
--- a/src/lib-mail/message-decoder.c
+++ b/src/lib-mail/message-decoder.c
@@ -248,6 +248,7 @@ message_decode_body_init_charset(struct message_decoder_context *ctx,
 	if (ctx->charset_trans != NULL && ctx->content_charset != NULL &&
 	    strcasecmp(ctx->content_charset, ctx->charset_trans_charset) == 0) {
 		/* already have the correct translation selected */
+		charset_to_utf8_reset(ctx->charset_trans);
 		return;
 	}