Merge pull request #495 from GeneralsOnlineDevelopmentTeam/seer/fix/gui-scorescreen-null-parent

x64-dev · web-flow · commit 15cf47663320 · 2026-05-07T17:27:28.000-04:00
bugfix(gui): Prevent null pointer dereference in ScoreScreen
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
@@ -1779,7 +1779,7 @@ void grabMultiPlayerInfo()
 	Int adder = 1; // Varible used to add on an offset to the score to make sure we don't add people to the same map
 
 	player = ThePlayerList->getLocalPlayer();
-	if (player)
+	if (player && parent)
 	{
 		const Image *image = TheMappedImageCollection->findImageByName("MutiPlayer_ScoreScreen");
 		if(image)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp
@@ -2296,7 +2296,7 @@ void grabMultiPlayerInfo( void )
 	Int adder = 1; // Varible used to add on an offset to the score to make sure we don't add people to the same map
 
 	player = ThePlayerList->getLocalPlayer();
-	if (player)
+	if (player && parent)
 	{
 		const Image *image = TheMappedImageCollection->findImageByName("MutiPlayer_ScoreScreen");
 		if(image)

Original file line number	Diff line number	Diff line change
`@@ -1779,7 +1779,7 @@ void grabMultiPlayerInfo()`
`1779`	`1779`	`Int adder = 1; // Varible used to add on an offset to the score to make sure we don't add people to the same map`
`1780`	`1780`
`1781`	`1781`	`player = ThePlayerList->getLocalPlayer();`
`1782`		`- if (player)`
	`1782`	`+ if (player && parent)`
`1783`	`1783`	`{`
`1784`	`1784`	`const Image *image = TheMappedImageCollection->findImageByName("MutiPlayer_ScoreScreen");`
`1785`	`1785`	`if(image)`
Original file line number	Diff line number	Diff line change
`@@ -2296,7 +2296,7 @@ void grabMultiPlayerInfo( void )`
`2296`	`2296`	`Int adder = 1; // Varible used to add on an offset to the score to make sure we don't add people to the same map`
`2297`	`2297`
`2298`	`2298`	`player = ThePlayerList->getLocalPlayer();`
`2299`		`- if (player)`
	`2299`	`+ if (player && parent)`
`2300`	`2300`	`{`
`2301`	`2301`	`const Image *image = TheMappedImageCollection->findImageByName("MutiPlayer_ScoreScreen");`
`2302`	`2302`	`if(image)`