From ef68bb1646d63a7c522f800e526d64b357c204de Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 21 Mar 2022 11:33:05 +0000
Subject: [PATCH] Add sanity check that direct-heap access has a heap bound

---
 renderdoc/driver/d3d12/d3d12_replay.cpp | 77 ++++++++++++++++---------
 1 file changed, 49 insertions(+), 28 deletions(-)

diff --git a/renderdoc/driver/d3d12/d3d12_replay.cpp b/renderdoc/driver/d3d12/d3d12_replay.cpp
index 6890d00ed..83d232bd3 100644
--- a/renderdoc/driver/d3d12/d3d12_replay.cpp
+++ b/renderdoc/driver/d3d12/d3d12_replay.cpp
@@ -1395,41 +1395,62 @@ void D3D12Replay::FillRootElements(uint32_t eventId, const D3D12RenderState::Roo
       }
       if(curUsage->bindType == BindType::Sampler)
       {
-        D3D12Descriptor *desc =
-            (D3D12Descriptor *)samplerHeap->GetCPUDescriptorHandleForHeapStart().ptr;
-        desc += curUsage->descIndex;
-        element->samplers.push_back(D3D12Pipe::Sampler());
-        D3D12Pipe::Sampler &samp = element->samplers.back();
-        const D3D12_SAMPLER_DESC &sampDesc = desc->GetSampler();
-        FillSampler(samp, sampDesc);
-        samp.tableIndex = curUsage->descIndex;
-        element->dynamicallyUsedCount++;
+        if(samplerHeap)
+        {
+          D3D12Descriptor *desc =
+              (D3D12Descriptor *)samplerHeap->GetCPUDescriptorHandleForHeapStart().ptr;
+          desc += curUsage->descIndex;
+          element->samplers.push_back(D3D12Pipe::Sampler());
+          D3D12Pipe::Sampler &samp = element->samplers.back();
+          const D3D12_SAMPLER_DESC &sampDesc = desc->GetSampler();
+          FillSampler(samp, sampDesc);
+          samp.tableIndex = curUsage->descIndex;
+          element->dynamicallyUsedCount++;
+        }
+        else
+        {
+          RDCERR("Access to sampler heap detected with no sampler heap bound");
+        }
       }
       else if(curUsage->bindType == BindType::ConstantBuffer)
       {
-        D3D12Descriptor *desc =
-            (D3D12Descriptor *)resourceHeap->GetCPUDescriptorHandleForHeapStart().ptr;
-        desc += curUsage->descIndex;
-        element->constantBuffers.push_back(D3D12Pipe::ConstantBuffer());
-        D3D12Pipe::ConstantBuffer &cb = element->constantBuffers.back();
+        if(resourceHeap)
+        {
+          D3D12Descriptor *desc =
+              (D3D12Descriptor *)resourceHeap->GetCPUDescriptorHandleForHeapStart().ptr;
+          desc += curUsage->descIndex;
+          element->constantBuffers.push_back(D3D12Pipe::ConstantBuffer());
+          D3D12Pipe::ConstantBuffer &cb = element->constantBuffers.back();
 
-        const D3D12_CONSTANT_BUFFER_VIEW_DESC &cbv = desc->GetCBV();
-        WrappedID3D12Resource::GetResIDFromAddr(cbv.BufferLocation, cb.resourceId, cb.byteOffset);
-        cb.resourceId = rm->GetOriginalID(cb.resourceId);
-        cb.byteSize = cbv.SizeInBytes;
-        cb.tableIndex = curUsage->descIndex;
-        element->dynamicallyUsedCount++;
+          const D3D12_CONSTANT_BUFFER_VIEW_DESC &cbv = desc->GetCBV();
+          WrappedID3D12Resource::GetResIDFromAddr(cbv.BufferLocation, cb.resourceId, cb.byteOffset);
+          cb.resourceId = rm->GetOriginalID(cb.resourceId);
+          cb.byteSize = cbv.SizeInBytes;
+          cb.tableIndex = curUsage->descIndex;
+          element->dynamicallyUsedCount++;
+        }
+        else
+        {
+          RDCERR("Access to resource heap detected with no resource heap bound");
+        }
       }
       else
       {
-        D3D12Descriptor *desc =
-            (D3D12Descriptor *)resourceHeap->GetCPUDescriptorHandleForHeapStart().ptr;
-        desc += curUsage->descIndex;
-        D3D12Pipe::View view;
-        FillResourceView(view, desc);
-        view.tableIndex = curUsage->descIndex;
-        element->views.push_back(view);
-        element->dynamicallyUsedCount++;
+        if(resourceHeap)
+        {
+          D3D12Descriptor *desc =
+              (D3D12Descriptor *)resourceHeap->GetCPUDescriptorHandleForHeapStart().ptr;
+          desc += curUsage->descIndex;
+          D3D12Pipe::View view;
+          FillResourceView(view, desc);
+          view.tableIndex = curUsage->descIndex;
+          element->views.push_back(view);
+          element->dynamicallyUsedCount++;
+        }
+        else
+        {
+          RDCERR("Access to resource heap detected with no resource heap bound");
+        }
       }
       curUsage++;
     }