Skip to content

[GEN][ZH] Fix crash when DEBUG_CRASHING is enabled and loading a replay with unicode characters #824

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
May 9, 2025
Merged

[GEN][ZH] Fix crash when DEBUG_CRASHING is enabled and loading a replay with unicode characters #824

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
b5d93cf
Workaround for crash in unicode conversion in RecorderClass::playback…
helmutbuhler May 7, 2025
1764ce9
Expand fix, change comment, fix macro
xezon May 9, 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
11 changes: 8 additions & 3 deletions Generals/Code/GameEngine/Source/Common/Recorder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1099,8 +1099,8 @@ Bool RecorderClass::playbackFile(AsciiString filename)
{
return FALSE;
}
#ifdef DEBUG_LOGGING

#ifdef DEBUG_CRASHING
Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();
Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();
Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();
Expand All @@ -1112,15 +1112,20 @@ Bool RecorderClass::playbackFile(AsciiString filename)
AsciiString tempStr;
if (exeDifferent)
{
// TheSuperHackers @fix helmutbuhler 05/05/2025 No longer attempts to print unicode as ascii
// via a call to AsciiString::format with %ls format. It does not work with non-ascii characters.
UnicodeString tempStrWide;
debugString = "EXE is different:\n";
if (versionStringDiff)
{
tempStr.format(" Version [%ls] vs [%ls]\n", TheVersion->getUnicodeVersion().str(), header.versionString.str());
tempStrWide.format(L" Version [%s] vs [%s]\n", TheVersion->getUnicodeVersion().str(), header.versionString.str());
tempStr.translate(tempStrWide);
debugString.concat(tempStr);
}
if (versionTimeStringDiff)
{
tempStr.format(" Build Time [%ls] vs [%ls]\n", TheVersion->getUnicodeBuildTime().str(), header.versionTimeString.str());
tempStrWide.format(L" Build Time [%s] vs [%s]\n", TheVersion->getUnicodeBuildTime().str(), header.versionTimeString.str());
tempStr.translate(tempStrWide);
debugString.concat(tempStr);
}
if (versionNumberDiff)
Expand Down
11 changes: 8 additions & 3 deletions GeneralsMD/Code/GameEngine/Source/Common/Recorder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,8 +1102,8 @@ Bool RecorderClass::playbackFile(AsciiString filename)
{
return FALSE;
}
#ifdef DEBUG_LOGGING

#ifdef DEBUG_CRASHING
Bool versionStringDiff = header.versionString != TheVersion->getUnicodeVersion();
Bool versionTimeStringDiff = header.versionTimeString != TheVersion->getUnicodeBuildTime();
Bool versionNumberDiff = header.versionNumber != TheVersion->getVersionNumber();
Expand All @@ -1115,15 +1115,20 @@ Bool RecorderClass::playbackFile(AsciiString filename)
AsciiString tempStr;
if (exeDifferent)
{
// TheSuperHackers @fix helmutbuhler 05/05/2025 No longer attempts to print unicode as ascii
// via a call to AsciiString::format with %ls format. It does not work with non-ascii characters.
UnicodeString tempStrWide;
debugString = "EXE is different:\n";
if (versionStringDiff)
{
tempStr.format(" Version [%ls] vs [%ls]\n", TheVersion->getUnicodeVersion().str(), header.versionString.str());
tempStrWide.format(L" Version [%s] vs [%s]\n", TheVersion->getUnicodeVersion().str(), header.versionString.str());
tempStr.translate(tempStrWide);
debugString.concat(tempStr);
}
if (versionTimeStringDiff)
{
tempStr.format(" Build Time [%ls] vs [%ls]\n", TheVersion->getUnicodeBuildTime().str(), header.versionTimeString.str());
tempStrWide.format(L" Build Time [%s] vs [%s]\n", TheVersion->getUnicodeBuildTime().str(), header.versionTimeString.str());
tempStr.translate(tempStrWide);
debugString.concat(tempStr);
}
if (versionNumberDiff)
Expand Down
Loading