From 3b76141efc1f5ed96f0a2973e383547a78087c83 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:19:06 +0000
Subject: [PATCH] bugfix(w3ddevice): Prevent null pointer dereference in
 W3DTreeBuffer for invalid tree meshes

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

diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
index 00bbf2d3b6c..4d86b1fe1df 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
+++ b/Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DTreeBuffer.cpp
@@ -1014,7 +1014,7 @@ void W3DTreeBuffer::updateVertexBuffer()
 			Real theSin = m_trees[curTree].sin;
 			Real theCos = m_trees[curTree].cos;
 			if (type<0 || m_treeTypes[type].m_mesh == nullptr) {
-				type = 0;
+				continue; // No valid mesh for this tree type, skip to avoid null pointer dereference.
 			}
 
 			Int startVertex = m_trees[curTree].firstIndex;
@@ -2038,3 +2038,7 @@ void W3DTreeBuffer::loadPostProcess()
 
 
 
+
+
+
+