From 82577c1538b0d0759aef3b920f8254c9ac491191 Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Wed, 29 Oct 2025 21:31:07 +0000
Subject: [PATCH] W3DTreeBuffer: Add null check for unit in unitMoved to
 prevent crashes

---
 .../Source/W3DDevice/GameClient/W3DTreeBuffer.cpp        | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
index 6527aeff55d..e88aff34f32 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
@@ -1140,6 +1140,11 @@ void W3DTreeBuffer::freeTreeBuffers(void)
 //=============================================================================
 void W3DTreeBuffer::unitMoved(Object *unit)
 {
+	// Null pointer check to prevent crash when invalid Object pointer is passed
+	if (unit == NULL) {
+		return;
+	}
+
 	if (unit->isKindOf(KINDOF_IMMOBILE)) {
 		// This is the initial positioning of the object, and we don't care. jba. [6/5/2003]
 		return;
@@ -2045,3 +2050,7 @@ void W3DTreeBuffer::loadPostProcess( void )
 
 
 
+
+
+
+