Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc7e325
fix(quotedprintable): Fix assert in AsciiStringToQuotedPrintable duri…
xezon Sep 30, 2025
26e6366
refactor(quotedprintable): Simplify and modernize code in QuotedPrint…
xezon Sep 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions Generals/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand All @@ -65,7 +65,8 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
dest[i++] = MAGIC_CHAR;
dest[i++] = intToHexDigit((*src)>>4);
dest[i++] = intToHexDigit((*src)&0xf);
} else
}
else
{
dest[i++] = *src;
}
Expand All @@ -91,7 +92,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 )
{
Expand All @@ -100,7 +101,8 @@ AsciiString AsciiStringToQuotedPrintable(AsciiString original)
dest[i++] = MAGIC_CHAR;
dest[i++] = intToHexDigit((*src)>>4);
dest[i++] = intToHexDigit((*src)&0xf);
} else
}
else
{
dest[i++] = *src;
}
Expand All @@ -117,8 +119,8 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)
static WideChar dest[1024];
int i=0;

unsigned char *c = (unsigned char *)dest;
const unsigned char *src = (const unsigned char *)original.str();
unsigned char *c = reinterpret_cast<unsigned char *>(dest);
const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());

while (*src && i<1023)
{
Expand Down Expand Up @@ -159,18 +161,17 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)

*c = 0;

UnicodeString out(dest);
return out;
return dest;
}

// Convert ascii quoted-printable strings into ascii strings
AsciiString QuotedPrintableToAsciiString(AsciiString original)
{
static unsigned char dest[1024];
static char dest[1024];
int i=0;

unsigned char *c = (unsigned char *)dest;
const unsigned char *src = (const unsigned char *)original.str();
unsigned char *c = reinterpret_cast<unsigned char *>(dest);
const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());

while (*src && i<1023)
{
Expand Down Expand Up @@ -200,6 +201,6 @@ AsciiString QuotedPrintableToAsciiString(AsciiString original)

*c = 0;

return AsciiString((const char *)dest);
return dest;
}

25 changes: 13 additions & 12 deletions GeneralsMD/Code/GameEngine/Source/Common/System/QuotedPrintable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand All @@ -65,7 +65,8 @@ AsciiString UnicodeStringToQuotedPrintable(UnicodeString original)
dest[i++] = MAGIC_CHAR;
dest[i++] = intToHexDigit((*src)>>4);
dest[i++] = intToHexDigit((*src)&0xf);
} else
}
else
{
dest[i++] = *src;
}
Expand All @@ -91,7 +92,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 )
{
Expand All @@ -100,7 +101,8 @@ AsciiString AsciiStringToQuotedPrintable(AsciiString original)
dest[i++] = MAGIC_CHAR;
dest[i++] = intToHexDigit((*src)>>4);
dest[i++] = intToHexDigit((*src)&0xf);
} else
}
else
{
dest[i++] = *src;
}
Expand All @@ -117,8 +119,8 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)
static WideChar dest[1024];
int i=0;

unsigned char *c = (unsigned char *)dest;
const unsigned char *src = (const unsigned char *)original.str();
unsigned char *c = reinterpret_cast<unsigned char *>(dest);
const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());

while (*src && i<1023)
{
Expand Down Expand Up @@ -159,18 +161,17 @@ UnicodeString QuotedPrintableToUnicodeString(AsciiString original)

*c = 0;

UnicodeString out(dest);
return out;
return dest;
}

// Convert ascii quoted-printable strings into ascii strings
AsciiString QuotedPrintableToAsciiString(AsciiString original)
{
static unsigned char dest[1024];
static char dest[1024];
int i=0;

unsigned char *c = (unsigned char *)dest;
const unsigned char *src = (const unsigned char *)original.str();
unsigned char *c = reinterpret_cast<unsigned char *>(dest);
const unsigned char *src = reinterpret_cast<const unsigned char *>(original.str());

while (*src && i<1023)
{
Expand Down Expand Up @@ -200,6 +201,6 @@ AsciiString QuotedPrintableToAsciiString(AsciiString original)

*c = 0;

return AsciiString((const char *)dest);
return dest;
}

Loading