Skip to content

CampaignManager: Add validation to prevent use-after-free crashes #65

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
+46 −0
Open

CampaignManager: Add validation to prevent use-after-free crashes #65

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
23 changes: 23 additions & 0 deletions Generals/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,30 @@ Mission *Campaign::getNextMission( Mission *current)
name = m_firstMission;
}
else
{
// Validate that current still points to a valid mission in our list
// to prevent use-after-free crashes
Bool foundCurrent = FALSE;
MissionListIt validateIt = m_missions.begin();
while(validateIt != m_missions.end())
{
if(*validateIt == current)
{
foundCurrent = TRUE;
break;
}
++validateIt;
}

// If current mission is not in our list anymore, it may have been freed
if(!foundCurrent)
{
DEBUG_LOG(("Campaign::getNextMission - current mission pointer is not in mission list, possible use-after-free"));
return NULL;
}

name = current->m_nextMission;
}
name.toLower();
MissionListIt it;
it = m_missions.begin();
Expand Down
23 changes: 23 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/System/CampaignManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,30 @@ Mission *Campaign::getNextMission( Mission *current)
name = m_firstMission;
}
else
{
// Validate that current still points to a valid mission in our list
// to prevent use-after-free crashes
Bool foundCurrent = FALSE;
MissionListIt validateIt = m_missions.begin();
while(validateIt != m_missions.end())
{
if(*validateIt == current)
{
foundCurrent = TRUE;
break;
}
++validateIt;
}

// If current mission is not in our list anymore, it may have been freed
if(!foundCurrent)
{
DEBUG_LOG(("Campaign::getNextMission - current mission pointer is not in mission list, possible use-after-free"));
return NULL;
}

name = current->m_nextMission;
}
name.toLower();
MissionListIt it;
it = m_missions.begin();
Expand Down
Loading