From 874920bc38cbe7394a4811a2c76ac651d8735d8e Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 12 Feb 2024 12:49:09 +0000
Subject: [PATCH] Fix potential crash on capture close accessing bad data

* Also added some conservative error checking on looking up chunk names.
---
 qrenderdoc/Windows/BufferViewer.cpp |  3 ++-
 qrenderdoc/Windows/EventBrowser.cpp | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp
index 9874eaa75..9c1fa956b 100644
--- a/qrenderdoc/Windows/BufferViewer.cpp
+++ b/qrenderdoc/Windows/BufferViewer.cpp
@@ -7017,7 +7017,8 @@ void BufferViewer::SetMeshFilter(MeshFilter filter, uint32_t taskGroup, uint32_t
       break;
   }
 
-  OnEventChanged(m_Ctx.CurEvent());
+  if(m_Ctx.IsCaptureLoaded())
+    OnEventChanged(m_Ctx.CurEvent());
 }
 
 void BufferViewer::on_rowOffset_valueChanged(int value)
diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp
index 0badfb9fc..8a893ee3d 100644
--- a/qrenderdoc/Windows/EventBrowser.cpp
+++ b/qrenderdoc/Windows/EventBrowser.cpp
@@ -1166,6 +1166,9 @@ private:
     if(eid == 0)
       return tr("Capture Start");
 
+    if(eid >= m_Actions.size())
+      return QVariant();
+
     const ActionDescription *action = m_Actions[eid];
 
     QString name;
@@ -1199,7 +1202,16 @@ private:
       {
         const APIEvent &e = *eidit;
 
-        const SDChunk *chunk = m_Ctx.GetStructuredFile().chunks[e.chunkIndex];
+        const StructuredChunkList &chunks = m_Ctx.GetStructuredFile().chunks;
+
+        if(e.chunkIndex >= chunks.size())
+          return QVariant();
+
+        const SDChunk *chunk = chunks[e.chunkIndex];
+
+        if(chunk == NULL)
+          return QVariant();
+
         name = chunk->name;
 
         // don't display any "ClassName::" prefix. We keep it for the API inspector which is more
@@ -5618,11 +5630,17 @@ APIEvent EventBrowser::GetAPIEventForEID(uint32_t eid)
 
 const ActionDescription *EventBrowser::GetActionForEID(uint32_t eid)
 {
+  if(!m_Ctx.IsCaptureLoaded())
+    return NULL;
+
   return m_Model->GetActionForEID(eid);
 }
 
 rdcstr EventBrowser::GetEventName(uint32_t eid)
 {
+  if(!m_Ctx.IsCaptureLoaded())
+    return rdcstr();
+
   return m_Model->GetEventName(eid);
 }