From edcfa9e3c18cbc9338554eb8b710d8e82f175606 Mon Sep 17 00:00:00 2001
From: Hecklezz <tj8@live.com.au>
Date: Thu, 13 Nov 2025 16:53:10 +1000
Subject: [PATCH] [FIRE-36091] Follow-up null checks on mVObjp to prevent
 crashes

Merged upstream in SLViewer PR#4996
---
 indra/newview/lldrawable.cpp     | 5 +++++
 indra/newview/llface.h           | 2 +-
 indra/newview/llviewerobject.cpp | 2 +-
 indra/newview/llvograss.cpp      | 2 +-
 indra/newview/pipeline.cpp       | 4 ++--
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/indra/newview/lldrawable.cpp b/indra/newview/lldrawable.cpp
index 855e6b30b6..4d6c296166 100644
--- a/indra/newview/lldrawable.cpp
+++ b/indra/newview/lldrawable.cpp
@@ -967,6 +967,11 @@ void LLDrawable::updateTexture()
         return;
     }
 
+    if (!mVObjp)
+    {
+        return;
+    }
+
     if (getNumFaces() != mVObjp->getNumTEs())
     { //drawable is transitioning its face count
         return;
diff --git a/indra/newview/llface.h b/indra/newview/llface.h
index febb367d1b..4b6c2a9d50 100644
--- a/indra/newview/llface.h
+++ b/indra/newview/llface.h
@@ -133,7 +133,7 @@ public:
     void            setIndexInTex(U32 ch, S32 index) { llassert(ch < LLRender::NUM_TEXTURE_CHANNELS); mIndexInTex[ch] = index; }
 
     void            setWorldMatrix(const LLMatrix4& mat);
-    const LLTextureEntry* getTextureEntry() const { return mVObjp->getTE(mTEOffset); }
+    const LLTextureEntry* getTextureEntry() const { return mVObjp ? mVObjp->getTE(mTEOffset) : nullptr; }
 
     LLFacePool*     getPool()           const   { return mDrawPoolp; }
     U32             getPoolType()       const   { return mPoolType; }
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 81a9138939..98b854dc51 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -7459,7 +7459,7 @@ void LLAlphaObject::getBlendFunc(S32 face, LLRender::eBlendFactor& src, LLRender
 void LLStaticViewerObject::updateDrawable(bool force_damped)
 {
     // Force an immediate rebuild on any update
-    if (mDrawable.notNull())
+    if (mDrawable.notNull() && mDrawable->getVObj())
     {
         mDrawable->updateXform(true);
         gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL);
diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp
index db37563e14..c133f1f5d2 100644
--- a/indra/newview/llvograss.cpp
+++ b/indra/newview/llvograss.cpp
@@ -781,7 +781,7 @@ void LLGrassPartition::getGeometry(LLSpatialGroup* group)
 void LLVOGrass::updateDrawable(bool force_damped)
 {
     // Force an immediate rebuild on any update
-    if (mDrawable.notNull())
+    if (mDrawable.notNull() && mDrawable->getVObj())
     {
         mDrawable->updateXform(true);
         gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_ALL);
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 597ba16f13..cc4bdbd771 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -3093,7 +3093,7 @@ void LLPipeline::markMoved(LLDrawable *drawablep, bool damped_motion)
 
 void LLPipeline::markShift(LLDrawable *drawablep)
 {
-    if (!drawablep || drawablep->isDead())
+    if (!drawablep || drawablep->isDead() || !drawablep->getVObj())
     {
         return;
     }
@@ -3127,7 +3127,7 @@ void LLPipeline::shiftObjects(const LLVector3 &offset)
             iter != mShiftList.end(); iter++)
     {
         LLDrawable *drawablep = *iter;
-        if (drawablep->isDead())
+        if (drawablep->isDead() || !drawablep->getVObj())
         {
             continue;
         }