From 5fb9e75cd8bed23c57757c269de5bbfcd9b99503 Mon Sep 17 00:00:00 2001
From: Hecklezz <tj8@live.com.au>
Date: Thu, 13 Nov 2025 01:45:07 +1000
Subject: [PATCH] [FIRE-36087] Fix crash in updateImagesCreateTextures
 accessing potentially freed image pointer

Merged upstream in SLViewer PR#4984
---
 indra/newview/llviewertexturelist.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 50d1d69576..17152b8e46 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -1124,7 +1124,6 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time)
 
         imagep->postCreateTexture();
         imagep->mCreatePending = false;
-        mCreateTextureList.pop();
 
         if (imagep->hasGLTexture() && imagep->getDiscardLevel() < imagep->getDesiredDiscardLevel() &&
            (imagep->getDesiredDiscardLevel() <= MAX_DISCARD_LEVEL))
@@ -1136,6 +1135,8 @@ F32 LLViewerTextureList::updateImagesCreateTextures(F32 max_time)
             imagep->scaleDown();
         }
 
+        mCreateTextureList.pop();
+
         if (create_timer.getElapsedTimeF32() > max_time)
         {
             break;