From 38a61a2ec6f57cc90b8ee8750ea80437eda3196a Mon Sep 17 00:00:00 2001
From: Cam Mannett <camden.mannett@arm.com>
Date: Sat, 2 Nov 2024 11:45:32 +0000
Subject: [PATCH] Do not access baseResourceMem on unbound buffer

---
 renderdoc/driver/vulkan/vk_memory.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/renderdoc/driver/vulkan/vk_memory.cpp b/renderdoc/driver/vulkan/vk_memory.cpp
index 24c3a5a62..4bd4616c2 100644
--- a/renderdoc/driver/vulkan/vk_memory.cpp
+++ b/renderdoc/driver/vulkan/vk_memory.cpp
@@ -42,6 +42,10 @@ GPUAddressRange WrappedVulkan::CreateAddressRange(VkDevice device, VkBuffer buff
   VkResourceRecord *record = GetRecord(buffer);
   VkResourceRecord *memrecord = GetResourceManager()->GetResourceRecord(record->baseResourceMem);
 
+  // Just in case this is called when a buffer is being destroyed without being bound
+  if(!memrecord)
+    return {};
+
   const VkBufferDeviceAddressInfo addrInfo = {
       VK_STRUCTURE_TYPE_BUFFER_DEVICE_ADDRESS_INFO,
       NULL,