From a9f583d9108cfcdc4973bc6374e0d078dbb868c9 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Mon, 19 Dec 2016 21:42:49 +0000
Subject: [PATCH] [Minor] Fix rfc2047 quoted printable version

---
 src/libutil/str_util.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libutil/str_util.c b/src/libutil/str_util.c
index c5df324b7..bccb0699f 100644
--- a/src/libutil/str_util.c
+++ b/src/libutil/str_util.c
@@ -1908,7 +1908,7 @@ decode:
 			if (end - o >= remain) {
 				processed = rspamd_memcspn (p, "=_", remain);
 				memcpy (o, p, processed);
-				o += remain;
+				o += processed;
 
 				if (processed == remain) {
 					break;
@@ -1918,7 +1918,7 @@ decode:
 					remain -= processed;
 					p += processed;
 
-					if (*p == '=') {
+					if (G_LIKELY (*p == '=')) {
 						p ++;
 						/* Skip comparison, as we know that we have found match */
 						goto decode;
@@ -1926,6 +1926,7 @@ decode:
 					else {
 						*o++ = ' ';
 						p ++;
+						remain --;
 					}
 				}
 			}
-- 
2.39.5