From 700597800ceaed70cea56c987ce3294545e7236b Mon Sep 17 00:00:00 2001
From: "seer-by-sentry[bot]"
 <157164994+seer-by-sentry[bot]@users.noreply.github.com>
Date: Sun, 21 Dec 2025 18:17:57 +0000
Subject: [PATCH] TextureLoadTask: Guard against NULL D3DTexture pointer
 dereference during surface locking

---
 .../Source/WWVegas/WW3D2/textureloader.cpp        | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
index 3b1fcfa61df..abd0d334c27 100644
--- a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
+++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp
@@ -1775,6 +1775,11 @@ bool TextureLoadTaskClass::Begin_Uncompressed_Load(void)
 
 void TextureLoadTaskClass::Lock_Surfaces(void)
 {
+	// Guard against NULL pointer dereference
+	if (!D3DTexture) {
+		return;
+	}
+
 	MipLevelCount = D3DTexture->GetLevelCount();
 
 	for (unsigned int i = 0; i < MipLevelCount; ++i)
@@ -2154,6 +2159,11 @@ void CubeTextureLoadTaskClass::Deinit()
 
 void CubeTextureLoadTaskClass::Lock_Surfaces(void)
 {
+	// Guard against NULL pointer dereference
+	if (!D3DTexture) {
+		return;
+	}
+
 	for (unsigned int f=0; f<6; f++)
 	{
 		for (unsigned int i=0; i<MipLevelCount; i++)
@@ -2526,6 +2536,11 @@ void VolumeTextureLoadTaskClass::Init(TextureBaseClass* tc, TaskType type, Prior
 
 void VolumeTextureLoadTaskClass::Lock_Surfaces()
 {
+	// Guard against NULL pointer dereference
+	if (!D3DTexture) {
+		return;
+	}
+
 	for (unsigned int i=0; i<MipLevelCount; i++)
 	{
 		D3DLOCKED_BOX locked_box;