Skip to content

Fix: Clear stale drawable pointer to prevent use-after-free #381

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: Clear stale drawable pointer to prevent use-after-free #381

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
10 changes: 10 additions & 0 deletions Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,6 +1609,16 @@ void ControlBar::onDrawableDeselected( Drawable *draw )
// set a dirty flag so next time we update we can reconstruct the UI
markUIDirty();

// TheSuperHackers @fix Clear the stale drawable pointer to prevent use-after-free crashes.
// m_currentSelectedDrawable is set in switchToContext but never cleared on drawable destruction.
// When destroyDrawable is called, disregardDrawable -> deselectDrawable -> onDrawableDeselected
// fires before deleteInstance(draw), so this check is safe and prevents the dangling pointer
// from being dereferenced in subsequent update/evaluateContextUI calls.
if( m_currentSelectedDrawable == draw )
{
m_currentSelectedDrawable = nullptr;
}

if (TheInGameUI->getSelectCount() == 0)
{
// we just deselected everything - cancel any pending GUI commands
Expand Down
10 changes: 10 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1634,6 +1634,16 @@ void ControlBar::onDrawableDeselected( Drawable *draw )
// set a dirty flag so next time we update we can reconstruct the UI
markUIDirty();

// TheSuperHackers @fix Clear the stale drawable pointer to prevent use-after-free crashes.
// m_currentSelectedDrawable is set in switchToContext but never cleared on drawable destruction.
// When destroyDrawable is called, disregardDrawable -> deselectDrawable -> onDrawableDeselected
// fires before deleteInstance(draw), so this check is safe and prevents the dangling pointer
// from being dereferenced in subsequent update/evaluateContextUI calls.
if( m_currentSelectedDrawable == draw )
{
m_currentSelectedDrawable = nullptr;
}

if (TheInGameUI->getSelectCount() == 0)
{
// we just deselected everything - cancel any pending GUI commands
Expand Down
Loading