From 2eb0669b0b53572c50a75e1066b2f1ec49fbc7cd Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Tue, 31 Mar 2026 12:46:55 +0000
Subject: [PATCH] bugfix(gui): Prevent null pointer dereference when checking
 child window tooltips

---
 .../Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp | 2 +-
 .../Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
index 679efce32e..24dccc9a30 100644
--- a/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
+++ b/Generals/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
@@ -1294,7 +1294,7 @@ GameWindow* GameWindowManager::findWindowUnderMouse(GameWindow*& toolTipWindow,
 		{
 			GameWindow* childWindow = window->winPointInAnyChild(mousePos->x, mousePos->y, TRUE, TRUE);
 
-			if (childWindow->m_tooltip || childWindow->m_instData.getTooltipTextLength())
+			if (childWindow && (childWindow->m_tooltip || childWindow->m_instData.getTooltipTextLength()))
 				toolTipWindow = childWindow;
 		}
 
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
index e59f6bab74..3a1c30de27 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GameWindowManager.cpp
@@ -1197,7 +1197,7 @@ GameWindow* GameWindowManager::findWindowUnderMouse(GameWindow*& toolTipWindow,
 		{
 			GameWindow* childWindow = window->winPointInAnyChild(mousePos->x, mousePos->y, TRUE, TRUE);
 
-			if (childWindow->m_tooltip || childWindow->m_instData.getTooltipTextLength())
+			if (childWindow && (childWindow->m_tooltip || childWindow->m_instData.getTooltipTextLength()))
 				toolTipWindow = childWindow;
 		}