From 14610372ce2b6eec2628e035eaf40d18df1065e3 Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Sat, 31 Jan 2026 16:58:21 +0000
Subject: [PATCH] Fix null pointer dereference in Team creation

---
 Generals/Code/GameEngine/Source/Common/RTS/Team.cpp   | 3 +++
 GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp
index 8dd327575c..a67a4c077e 100644
--- a/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp
+++ b/Generals/Code/GameEngine/Source/Common/RTS/Team.cpp
@@ -366,6 +366,9 @@ Team *TeamFactory::createTeam(const AsciiString& name)
 {
 	Team *t = NULL;
 	t = createInactiveTeam(name);
+	if (!t) {
+		return nullptr;
+	}
 	t->setActive();
 	return t;
 }
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp
index 7d28fc8d62..34cc264194 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/Team.cpp
@@ -366,6 +366,9 @@ Team *TeamFactory::createTeam(const AsciiString& name)
 {
 	Team *t = NULL;
 	t = createInactiveTeam(name);
+	if (!t) {
+		return nullptr;
+	}
 	t->setActive();
 	return t;
 }