Skip to content

bugfix(loadscreen): Prevent null dereference in ChallengeLoadScreen::init from invalid campaign/mission #506

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

Draft
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

bugfix(loadscreen): Prevent null dereference in ChallengeLoadScreen::init from invalid campaign/mission #506

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: 33 additions & 4 deletions Core/GameEngine/Source/GameClient/GUI/LoadScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,16 +929,45 @@ void ChallengeLoadScreen::activatePiecesMinSpec(const GeneralPersona *generalPla

void ChallengeLoadScreen::init( GameInfo *game )
{
const Campaign *campaign = TheCampaignManager->getCurrentCampaign();
const Mission *mission = TheCampaignManager->getCurrentMission();
const Campaign *campaign = TheCampaignManager ? TheCampaignManager->getCurrentCampaign() : NULL;
const Mission *mission = TheCampaignManager ? TheCampaignManager->getCurrentMission() : NULL;

// Guard against null campaign/mission. In release builds DEBUG_ASSERTCRASH is
// compiled out, so without these checks the AsciiString copy constructor below
// would dereference a null pointer and crash (see Sentry CLIENT-33Q).
if (campaign == NULL || mission == NULL)
{
DEBUG_CRASH(("ChallengeLoadScreen::init invoked with null campaign (%p) or mission (%p); aborting load.",
campaign, mission));
return;
}

if (mission->m_generalName.isEmpty())
{
DEBUG_CRASH(("ChallengeLoadScreen::init: mission has empty m_generalName, check Campaign.ini; aborting load."));
return;
}

if (TheChallengeGenerals == NULL)
{
DEBUG_CRASH(("ChallengeLoadScreen::init: TheChallengeGenerals is null; aborting load."));
return;
}

// the player general is tied to the campaign
const GeneralPersona* generalPlayer = TheChallengeGenerals->getPlayerGeneralByCampaignName( campaign->m_name );

// the opponent general is tied to the mission
DEBUG_ASSERTCRASH(mission->m_generalName.isNotEmpty(), ("No GeneralName associated with this mission, check Campaign.ini"));
const GeneralPersona* generalOpponent = TheChallengeGenerals->getGeneralByGeneralName( mission->m_generalName );

if (generalPlayer == NULL || generalOpponent == NULL)
{
DEBUG_CRASH(("ChallengeLoadScreen::init: failed to resolve generals (player=%p, opponent=%p) for campaign '%s' / mission general '%s'; aborting load.",
generalPlayer, generalOpponent,
campaign->m_name.str(), mission->m_generalName.str()));
return;
}

// create the layout of the load screen
m_loadScreen = TheWindowManager->winCreateFromScript( "Menus/ChallengeLoadScreen.wnd" );
DEBUG_ASSERTCRASH(m_loadScreen, ("Can't initialize the single player loadscreen"));
Expand All @@ -953,7 +982,7 @@ void ChallengeLoadScreen::init( GameInfo *game )
m_ambientLoop.setEventName("LoadScreenAmbient");

// create the new background video stream
m_videoStream = TheVideoPlayer->open( TheCampaignManager->getCurrentMission()->m_movieLabel );
m_videoStream = TheVideoPlayer->open( mission->m_movieLabel );

// Create the new buffer
m_videoBuffer = TheDisplay->createVideoBuffer();
Expand Down
Loading