From ad3a8b85e7b27b015b21c34dc84f89f17d40e073 Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Fri, 14 Nov 2025 22:09:28 +0000
Subject: [PATCH] WorldHeightMap: Add null check for m_extraBlendTileNdxes
 before accessing it

---
 .../Source/W3DDevice/GameClient/WorldHeightMap.cpp              | 2 +-
 .../Source/W3DDevice/GameClient/WorldHeightMap.cpp              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
index 8a2066b5613..a8805a11915 100644
--- a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
+++ b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
@@ -1764,7 +1764,7 @@ Bool WorldHeightMap::getExtraAlphaUVData(Int xIndex, Int yIndex, float U[4], flo
 	*needFlip = FALSE;
 	*cliff = FALSE;
 
-	if ( (ndx>=0) && (ndx<m_dataSize) && m_tileNdxes) {
+	if ( (ndx>=0) && (ndx<m_dataSize) && m_tileNdxes && m_extraBlendTileNdxes) {
 		Short blendNdx = m_extraBlendTileNdxes[ndx];
 		if (blendNdx == 0) {
 			return FALSE;
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
index c5b6bddffd0..323b6b533f1 100644
--- a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
+++ b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/WorldHeightMap.cpp
@@ -1968,7 +1968,7 @@ Bool WorldHeightMap::getExtraAlphaUVData(Int xIndex, Int yIndex, float U[4], flo
 	*needFlip = FALSE;
 	*cliff = FALSE;
 
-	if ( (ndx>=0) && (ndx<m_dataSize) && m_tileNdxes) {
+	if ( (ndx>=0) && (ndx<m_dataSize) && m_tileNdxes && m_extraBlendTileNdxes) {
 		Short blendNdx = m_extraBlendTileNdxes[ndx];
 		if (blendNdx == 0) {
 			return FALSE;