Skip to content

Fix: Prevent use-after-free crash during GlobalData destruction #375

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
Open

Fix: Prevent use-after-free crash during GlobalData destruction #375

Show file tree
Hide file tree
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
37 changes: 37 additions & 0 deletions Generals/Code/GameEngine/Source/Common/GlobalData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,43 @@ GlobalData::~GlobalData( void )
TheWritableGlobalData = nullptr;
}

// TheSuperHackers @fix Explicitly clear all AsciiString members and vectors before the automatic member
// destructors run. This ensures AsciiString::releaseBuffer() is called while the memory infrastructure
// (TheDynamicMemoryAllocator, TheAsciiStringCriticalSection) is still valid, avoiding use-after-free
// crashes that can occur when GlobalData override instances are destroyed during gameplay or shutdown.
m_simulateReplays.clear();
m_standardPublicBones.clear();
m_mapName.clear();
m_moveHintName.clear();
for (Int i = 0; i < MAX_WATER_GRID_SETTINGS; ++i)
m_vertexWaterAvailableMaps[i].clear();
m_levelGainAnimationName.clear();
m_getHealedAnimationName.clear();
m_autoFireParticleSmallPrefix.clear();
m_autoFireParticleSmallSystem.clear();
m_autoFireParticleMediumPrefix.clear();
m_autoFireParticleMediumSystem.clear();
m_autoFireParticleLargePrefix.clear();
m_autoFireParticleLargeSystem.clear();
m_autoSmokeParticleSmallPrefix.clear();
m_autoSmokeParticleSmallSystem.clear();
m_autoSmokeParticleMediumPrefix.clear();
m_autoSmokeParticleMediumSystem.clear();
m_autoSmokeParticleLargePrefix.clear();
m_autoSmokeParticleLargeSystem.clear();
m_autoAflameParticlePrefix.clear();
m_autoAflameParticleSystem.clear();
m_shellMapName.clear();
m_initialFile.clear();
m_pendingFile.clear();
m_specialPowerViewObjectName.clear();
m_modDir.clear();
m_modBIG.clear();
#if defined(RTS_DEBUG)
m_baseStatsDir.clear();
m_MOTDPath.clear();
#endif

}

//-------------------------------------------------------------------------------------------------
Expand Down
37 changes: 37 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/Common/GlobalData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,6 +1095,43 @@ GlobalData::~GlobalData( void )
TheWritableGlobalData = nullptr;
}

// TheSuperHackers @fix Explicitly clear all AsciiString members and vectors before the automatic member
// destructors run. This ensures AsciiString::releaseBuffer() is called while the memory infrastructure
// (TheDynamicMemoryAllocator, TheAsciiStringCriticalSection) is still valid, avoiding use-after-free
// crashes that can occur when GlobalData override instances are destroyed during gameplay or shutdown.
m_simulateReplays.clear();
m_standardPublicBones.clear();
m_mapName.clear();
m_moveHintName.clear();
for (Int i = 0; i < MAX_WATER_GRID_SETTINGS; ++i)
m_vertexWaterAvailableMaps[i].clear();
m_levelGainAnimationName.clear();
m_getHealedAnimationName.clear();
m_autoFireParticleSmallPrefix.clear();
m_autoFireParticleSmallSystem.clear();
m_autoFireParticleMediumPrefix.clear();
m_autoFireParticleMediumSystem.clear();
m_autoFireParticleLargePrefix.clear();
m_autoFireParticleLargeSystem.clear();
m_autoSmokeParticleSmallPrefix.clear();
m_autoSmokeParticleSmallSystem.clear();
m_autoSmokeParticleMediumPrefix.clear();
m_autoSmokeParticleMediumSystem.clear();
m_autoSmokeParticleLargePrefix.clear();
m_autoSmokeParticleLargeSystem.clear();
m_autoAflameParticlePrefix.clear();
m_autoAflameParticleSystem.clear();
m_shellMapName.clear();
m_initialFile.clear();
m_pendingFile.clear();
m_specialPowerViewObjectName.clear();
m_modDir.clear();
m_modBIG.clear();
#if defined(RTS_DEBUG)
m_baseStatsDir.clear();
m_MOTDPath.clear();
#endif

}

//-------------------------------------------------------------------------------------------------
Expand Down
Loading