From 3ca4bb6bf7ba1367e06705da3968174ff9448d7d Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 15 Aug 2024 15:56:53 +0200
Subject: #2307 BugSplat Crash #1504734: LLViewerTexture::getNumFaces()

---
 indra/newview/llviewertexture.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp
index 9aee1c0caf..03dca1e5f3 100644
--- a/indra/newview/llviewertexture.cpp
+++ b/indra/newview/llviewertexture.cpp
@@ -834,7 +834,7 @@ S32 LLViewerTexture::getTotalNumFaces() const
 S32 LLViewerTexture::getNumFaces(U32 ch) const
 {
     llassert(ch < LLRender::NUM_TEXTURE_CHANNELS);
-    return mNumFaces[ch];
+    return ch < LLRender::NUM_TEXTURE_CHANNELS ? mNumFaces[ch] : 0;
 }
 
 
-- 
cgit v1.2.3


From 10ef293bc93230437d8aa3b17fcc1bfdc78f6ba8 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 15 Aug 2024 17:46:58 +0200
Subject: BugSplat Crash #1504587: std::vector::empty()

---
 indra/llcommon/lltracethreadrecorder.cpp | 45 ++++++++++++++++----------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index be3e585ef8..375cb050cc 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -159,7 +159,8 @@ AccumulatorBufferGroup* ThreadRecorder::activate( AccumulatorBufferGroup* record
 ThreadRecorder::active_recording_list_t::iterator ThreadRecorder::bringUpToDate( AccumulatorBufferGroup* recording )
 {
 #if LL_TRACE_ENABLED
-    if (mActiveRecordings.empty()) return mActiveRecordings.end();
+    if (mActiveRecordings.empty())
+        return mActiveRecordings.end();
 
     mActiveRecordings.back()->mPartialRecording.sync();
     BlockTimer::updateTimes();
@@ -202,7 +203,7 @@ ThreadRecorder::active_recording_list_t::iterator ThreadRecorder::bringUpToDate(
 #endif
 }
 
-void ThreadRecorder::deactivate( AccumulatorBufferGroup* recording )
+void ThreadRecorder::deactivate(AccumulatorBufferGroup* recording)
 {
 #if LL_TRACE_ENABLED
     active_recording_list_t::iterator recording_it = bringUpToDate(recording);
@@ -228,9 +229,10 @@ void ThreadRecorder::deactivate( AccumulatorBufferGroup* recording )
 #endif
 }
 
-ThreadRecorder::ActiveRecording::ActiveRecording( AccumulatorBufferGroup* target )
+ThreadRecorder::ActiveRecording::ActiveRecording(AccumulatorBufferGroup* target)
 :   mTargetRecording(target)
-{}
+{
+}
 
 void ThreadRecorder::ActiveRecording::movePartialToTarget()
 {
@@ -243,30 +245,30 @@ void ThreadRecorder::ActiveRecording::movePartialToTarget()
 
 
 // called by child thread
-void ThreadRecorder::addChildRecorder( class ThreadRecorder* child )
+void ThreadRecorder::addChildRecorder(ThreadRecorder* child)
 {
 #if LL_TRACE_ENABLED
-    { LLMutexLock lock(&mChildListMutex);
-        mChildThreadRecorders.push_back(child);
-    }
+    LLMutexLock lock(&mChildListMutex);
+    mChildThreadRecorders.push_back(child);
 #endif
 }
 
 // called by child thread
-void ThreadRecorder::removeChildRecorder( class ThreadRecorder* child )
+void ThreadRecorder::removeChildRecorder(ThreadRecorder* child)
 {
 #if LL_TRACE_ENABLED
-    { LLMutexLock lock(&mChildListMutex);
-        mChildThreadRecorders.remove(child);
-    }
+    LLMutexLock lock(&mChildListMutex);
+    mChildThreadRecorders.remove(child);
 #endif
 }
 
 void ThreadRecorder::pushToParent()
 {
 #if LL_TRACE_ENABLED
-    { LLMutexLock lock(&mSharedRecordingMutex);
-        LLTrace::get_thread_recorder()->bringUpToDate(&mThreadRecordingBuffers);
+    if (ThreadRecorder* recorder = LLTrace::get_thread_recorder())
+    {
+        LLMutexLock lock(&mSharedRecordingMutex);
+        recorder->bringUpToDate(&mThreadRecordingBuffers);
         mSharedRecordingBuffers.append(mThreadRecordingBuffers);
         mThreadRecordingBuffers.reset();
     }
@@ -278,15 +280,14 @@ void ThreadRecorder::pullFromChildren()
 {
 #if LL_TRACE_ENABLED
     LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
-    if (mActiveRecordings.empty()) return;
-
-    { LLMutexLock lock(&mChildListMutex);
-
+    if (!mActiveRecordings.empty())
+    {
+        LLMutexLock lock(&mChildListMutex);
         AccumulatorBufferGroup& target_recording_buffers = mActiveRecordings.back()->mPartialRecording;
         target_recording_buffers.sync();
         for (LLTrace::ThreadRecorder* rec : mChildThreadRecorders)
-        { LLMutexLock lock(&(rec->mSharedRecordingMutex));
-
+        {
+            LLMutexLock lock(&(rec->mSharedRecordingMutex));
             target_recording_buffers.merge(rec->mSharedRecordingBuffers);
             rec->mSharedRecordingBuffers.reset();
         }
@@ -294,13 +295,11 @@ void ThreadRecorder::pullFromChildren()
 #endif
 }
 
-
-void set_master_thread_recorder( ThreadRecorder* recorder )
+void set_master_thread_recorder(ThreadRecorder* recorder)
 {
     sMasterThreadRecorder = recorder;
 }
 
-
 ThreadRecorder* get_master_thread_recorder()
 {
     return sMasterThreadRecorder;
-- 
cgit v1.2.3