From fe73c67168ef597e04fdc6fe230d4724cc9497c3 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Wed, 11 Aug 2021 17:17:22 +0300
Subject: SL-15798 Crash in clearCachedVisibleObjects
---
indra/newview/llviewerregion.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'indra')
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 7628a6c7ef..4c7868cbe5 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1439,7 +1439,12 @@ void LLViewerRegion::clearCachedVisibleObjects()
for(LLVOCacheEntry::vocache_entry_set_t::iterator iter = mImpl->mActiveSet.begin();
iter != mImpl->mActiveSet.end(); ++iter)
{
- LLDrawable* drawablep = (LLDrawable*)(*iter)->getEntry()->getDrawable();
+ LLVOCacheEntry* vo_entry = *iter;
+ if (!vo_entry || !vo_entry->getEntry())
+ {
+ continue;
+ }
+ LLDrawable* drawablep = (LLDrawable*)vo_entry->getEntry()->getDrawable();
if(drawablep && !drawablep->getParent())
{
--
cgit v1.2.3