From 3ed330e2f9a5239044ede720894fe25ca1d675c7 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 10 Oct 2023 19:44:33 +0300
Subject: =?UTF-8?q?fixes=20#3728=20(YAMN:=20=D1=83=D0=BA=D1=80=D0=B0=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=81=D0=BA=D0=B8=D0=B5=20=D1=81=D0=B8=D0=BC=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8B=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B0?=
 =?UTF-8?q?=D1=8E=D1=82=D1=81=D1=8F=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=80=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=BD=D0=BE)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protocols/YAMN/src/mails/decode.cpp | 38 +++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'protocols/YAMN/src')

diff --git a/protocols/YAMN/src/mails/decode.cpp b/protocols/YAMN/src/mails/decode.cpp
index 0a2abb260e..8d8b9e7324 100644
--- a/protocols/YAMN/src/mails/decode.cpp
+++ b/protocols/YAMN/src/mails/decode.cpp
@@ -242,37 +242,39 @@ int DecodeQuotedPrintable(char *Src, char *Dst, int DstLen, BOOL isQ)
 	DebugLog(DecodeFile, "<Decode Quoted><Input>%s</Input>", Src);
 	#endif
 
-	for (int Counter = 0; (*Src != 0) && DstLen && (Counter++ < DstLen); Src++, Dst++) {
+	for (auto *Limit = Dst + DstLen; *Src != 0 && Dst < Limit; Src++) {
 		if (*Src == '=') {
+			Src++;
+			if (*Src == 0)
+				break;
+
 			if (!isQ) {
-				if (Src[1] == '\r') {
-					Src++; Src++;
-					if (Src[0] == '\n')
+				if (*Src == '\r') {
+					if (Src[1] == '\n')
 						Src++;
-					goto CopyCharQuotedPrintable;
-				}
-				if (Src[1] == '\n') {
-					Src++; Src++;
-					goto CopyCharQuotedPrintable;
+					continue;
 				}
+
+				if (*Src == '\n')
+					continue;
 			}
+
 			char First, Second;
-			if (!FromHexa(*(++Src), &First)) {
-				*Dst++ = '='; Src--;
+			if (!FromHexa(Src[0], &First)) {
+				*Dst++ = '=';
 				continue;
 			}
-			if (!FromHexa(*(++Src), &Second)) {
-				*Dst++ = '='; Src--; Src--;
+			if (!FromHexa(Src[1], &Second)) {
+				*Dst++ = '='; Src--;
 				continue;
 			}
-			*Dst = (char)(First) << 4;
-			*Dst += Second;
+			*Dst++ = ((char)(First) << 4) + Second;
+			Src++;
 		}
 		else if (isQ && *Src == '_')
-			*Dst = ' ';
+			*Dst++ = ' ';
 		else
-CopyCharQuotedPrintable:
-			*Dst = *Src;
+			*Dst++ = *Src;
 	}
 	*Dst = 0;
 
-- 
cgit v1.2.3