Skip to content

bugfix(overridable): Prevent dangling pointer after removing override chain #472

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

bugfix(overridable): Prevent dangling pointer after removing override chain #472

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
9 changes: 9 additions & 0 deletions Generals/Code/GameEngine/Include/Common/Overridable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@ class Overridable : public MemoryPoolObject
{
if ( m_isOverride )
{
// TheSuperHackers @bugfix Clean up the override chain before deleting this node.
// Without this, deleteInstance(this) triggers ~Overridable() which deletes m_nextOverride
// via the destructor, but the caller may still hold a pointer to the now-freed chain,
// creating a dangling pointer that causes an access violation in getFinalOverride().
if ( m_nextOverride )
{
m_nextOverride->deleteOverrides();
m_nextOverride = nullptr;
}
deleteInstance(this);
return nullptr;
}
Expand Down
9 changes: 9 additions & 0 deletions GeneralsMD/Code/GameEngine/Include/Common/Overridable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@ class Overridable : public MemoryPoolObject
{
if ( m_isOverride )
{
// TheSuperHackers @bugfix Clean up the override chain before deleting this node.
// Without this, deleteInstance(this) triggers ~Overridable() which deletes m_nextOverride
// via the destructor, but the caller may still hold a pointer to the now-freed chain,
// creating a dangling pointer that causes an access violation in getFinalOverride().
if ( m_nextOverride )
{
m_nextOverride->deleteOverrides();
m_nextOverride = nullptr;
}
deleteInstance(this);
return nullptr;
}
Expand Down
Loading