Skip to content

Fix: Delay critical section cleanup to prevent static destructor crashes #134

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −4
Open

Fix: Delay critical section cleanup to prevent static destructor crashes #134

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions Generals/Code/Main/WinMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,10 +853,14 @@ Int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,

}

TheAsciiStringCriticalSection = NULL;
TheUnicodeStringCriticalSection = NULL;
TheDmaCriticalSection = NULL;
TheMemoryPoolCriticalSection = NULL;
// TheSuperHackers @bugfix Sentry 05/01/2025 Don't set critical sections to NULL before static destructors run.
// Static objects like TheWritableGlobalData contain AsciiString members that need the critical sections
// during their destruction. The critical section objects (critSec1-5) are static locals and will be
// destroyed automatically after this function returns, which is the correct cleanup order.
// TheAsciiStringCriticalSection = NULL;
// TheUnicodeStringCriticalSection = NULL;
// TheDmaCriticalSection = NULL;
// TheMemoryPoolCriticalSection = NULL;

return exitcode;

Expand Down