Skip to content

[GEN][ZH] Prevent game crash when starting a new game without a map #993

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

Merged
xezon merged 2 commits into from
Jun 6, 2025
Merged

[GEN][ZH] Prevent game crash when starting a new game without a map #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c38085b
[GEN][ZH] Prevent dereferencing NULL pointer 'md' in populateRandomSt…
xezon May 25, 2025
4710d51
[GEN][ZH] Prevent dereferencing NULL pointer 'pSL' in GameLogic::star…
xezon Jun 1, 2025
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
22 changes: 14 additions & 8 deletions Generals/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,8 @@ static void populateRandomSideAndColor( GameInfo *game )

// ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
static const WaypointMap s_emptyWaypoints = WaypointMap();

static void populateRandomStartPosition( GameInfo *game )
{
if(!game)
Expand All @@ -804,12 +806,13 @@ static void populateRandomStartPosition( GameInfo *game )
{
if (i != j && (i<numPlayers && j<numPlayers))
{
const WaypointMap& waypoints = md ? md->m_waypoints : s_emptyWaypoints;
AsciiString w1, w2;
w1.format("Player_%d_Start", i+1);
w2.format("Player_%d_Start", j+1);
WaypointMap::const_iterator c1 = md->m_waypoints.find(w1);
WaypointMap::const_iterator c2 = md->m_waypoints.find(w2);
if (c1 == md->m_waypoints.end() || c2 == md->m_waypoints.end())
WaypointMap::const_iterator c1 = waypoints.find(w1);
WaypointMap::const_iterator c2 = waypoints.find(w2);
if (c1 == waypoints.end() || c2 == waypoints.end())
{
// couldn't find a waypoint. must be kinda far away.
startSpotDistance[i][j] = 1000000.0f;
Expand Down Expand Up @@ -1409,12 +1412,15 @@ void GameLogic::startNewGame( Bool saveGame )
if (count)
{
ScriptList *pSL = TheSidesList->getSideInfo(0)->getScriptList();
Script *next = scripts[0]->getScript();
while (next)
if (pSL != NULL)
{
Script *dupe = next->duplicate();
pSL->addScript(dupe, 0);
next = next->getNext();
Script *next = scripts[0]->getScript();
while (next)
{
Script *dupe = next->duplicate();
pSL->addScript(dupe, 0);
next = next->getNext();
}
}
}
for (Int i=0; i<count; ++i)
Expand Down
22 changes: 14 additions & 8 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/System/GameLogic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,6 +829,8 @@ static void populateRandomSideAndColor( GameInfo *game )

// ------------------------------------------------------------------------------------------------
// ------------------------------------------------------------------------------------------------
static const WaypointMap s_emptyWaypoints = WaypointMap();

static void populateRandomStartPosition( GameInfo *game )
{
if(!game)
Expand All @@ -849,12 +851,13 @@ static void populateRandomStartPosition( GameInfo *game )
{
if (i != j && (i<numPlayers && j<numPlayers))
{
const WaypointMap& waypoints = md ? md->m_waypoints : s_emptyWaypoints;
AsciiString w1, w2;
w1.format("Player_%d_Start", i+1);
w2.format("Player_%d_Start", j+1);
WaypointMap::const_iterator c1 = md->m_waypoints.find(w1);
WaypointMap::const_iterator c2 = md->m_waypoints.find(w2);
if (c1 == md->m_waypoints.end() || c2 == md->m_waypoints.end())
WaypointMap::const_iterator c1 = waypoints.find(w1);
WaypointMap::const_iterator c2 = waypoints.find(w2);
if (c1 == waypoints.end() || c2 == waypoints.end())
{
// couldn't find a waypoint. must be kinda far away.
startSpotDistance[i][j] = 1000000.0f;
Expand Down Expand Up @@ -1571,12 +1574,15 @@ void GameLogic::startNewGame( Bool loadingSaveGame )
if (count)
{
ScriptList *pSL = TheSidesList->getSideInfo(0)->getScriptList();
Script *next = scripts[0]->getScript();
while (next)
if (pSL != NULL)
{
Script *dupe = next->duplicate();
pSL->addScript(dupe, 0);
next = next->getNext();
Script *next = scripts[0]->getScript();
while (next)
{
Script *dupe = next->duplicate();
pSL->addScript(dupe, 0);
next = next->getNext();
}
}
}
for (Int i=0; i<count; ++i)
Expand Down
Loading