fix(quotedprintable): Fix assert in AsciiStringToQuotedPrintable during map cache generation (#1659)

xezon · xezon · commit 11b61d5795a6 · 2025-10-08T19:29:46.000+02:00
diff --git a/Generals/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp b/Generals/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
@@ -56,7 +56,7 @@ static int hexDigitToInt(char c)
 AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 {
 	static char dest[1024];
-	const char *src = (const char *)original.str();
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 	int i=0;
 	while ( !(src[0]=='\0' && src[1]=='\0') && i<1021 )
 	{
@@ -91,7 +91,7 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 AsciiString AsciiStringToQuotedPrintable(AsciiString original)
 {
 	static char dest[1024];
-	const char *src = (const char *)original.str();
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 	int i=0;
 	while ( src[0]!='\0' && i<1021 )
 	{
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp b/GeneralsMD/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
@@ -56,7 +56,7 @@ static int hexDigitToInt(char c)
 AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 {
 	static char dest[1024];
-	const char *src = (const char *)original.str();
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 	int i=0;
 	while ( !(src[0]=='\0' && src[1]=='\0') && i<1021 )
 	{
@@ -91,7 +91,7 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
 AsciiString AsciiStringToQuotedPrintable(AsciiString original)
 {
 	static char dest[1024];
-	const char *src = (const char *)original.str();
+	const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());
 	int i=0;
 	while ( src[0]!='\0' && i<1021 )
 	{

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ static int hexDigitToInt(char c)`
`56`	`56`	`AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)`
`57`	`57`	`{`
`58`	`58`	`static char dest[1024];`
`59`		`- const char src = (const char )original.str();`
	`59`	`+ const unsigned char src = reinterpret_cast<const unsigned char >(original.str());`
`60`	`60`	`int i=0;`
`61`	`61`	`while ( !(src[0]=='\0' && src[1]=='\0') && i<1021 )`
`62`	`62`	`{`
`@@ -91,7 +91,7 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)`
`91`	`91`	`AsciiString AsciiStringToQuotedPrintable(AsciiString original)`
`92`	`92`	`{`
`93`	`93`	`static char dest[1024];`
`94`		`- const char src = (const char )original.str();`
	`94`	`+ const unsigned char src = reinterpret_cast<const unsigned char >(original.str());`
`95`	`95`	`int i=0;`
`96`	`96`	`while ( src[0]!='\0' && i<1021 )`
`97`	`97`	`{`