From bb025d37803f85aa154ec1407716fb7f7abd4c61 Mon Sep 17 00:00:00 2001 From: "seer-by-sentry[bot]" <157164994+seer-by-sentry[bot]@users.noreply.github.com> Date: Thu, 7 May 2026 21:26:51 +0000 Subject: [PATCH] bugfix(gui): Prevent null pointer dereference in ScoreScreen --- .../Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 2 +- .../Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/ScoreScreen.cpp index a217b8023c5..d7638971d89 100644 --- 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 index 40ee522169d..5dd23046ac5 100644 --- 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)