From 597409f2e12bb46b89d90d40012b6c995e399368 Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Sat, 11 Oct 2025 03:48:14 +0000
Subject: [PATCH] NGMP: Add null check for pCurrentGame before accessing its
 slots

---
 .../GameNetwork/GeneralsOnline/NextGenTransport.cpp    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NextGenTransport.cpp b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NextGenTransport.cpp
index 870ed6e39e0..cbd8aef5656 100644
--- a/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NextGenTransport.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NextGenTransport.cpp
@@ -190,7 +190,13 @@ Bool NextGenTransport::doSend(void)
 				return FALSE;
 			}
 
-			NGMPGameSlot* pSlot = (NGMPGameSlot*)pLobbyInterface->GetCurrentGame()->getSlot(m_outBuffer[i].addr);
+			NGMPGame* pCurrentGame = pLobbyInterface->GetCurrentGame();
+			if (pCurrentGame == nullptr)
+			{
+				return FALSE;
+			}
+
+			NGMPGameSlot* pSlot = (NGMPGameSlot*)pCurrentGame->getSlot(m_outBuffer[i].addr);
 
 			if (pSlot != nullptr)
 			{
@@ -269,4 +275,4 @@ Bool NextGenTransport::queueSend(UnsignedInt addr, UnsignedShort port, const Uns
 		}
 	}
 	return false;
-}
+}