From 046a86d5abae8445ea2c7aeec47518819b4ff8b7 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 25 Aug 2025 17:51:09 +0100
Subject: [PATCH] Handle NULL descriptors being created with 0 address

---
 renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
index 44109e60a..4d91f4ae6 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_descriptor_funcs.cpp
@@ -3486,7 +3486,7 @@ void WrappedVulkan::vkGetDescriptorEXT(VkDevice device, const VkDescriptorGetInf
       {
         // uniform/storage are identical in the union. Since the type forms part of our this
         // logic can be done in common
-        if(pDescriptorInfo->data.pUniformBuffer)
+        if(pDescriptorInfo->data.pUniformBuffer && pDescriptorInfo->data.pUniformBuffer->address)
         {
           VkFormat fmt = VK_FORMAT_UNDEFINED;
           if(pDescriptorInfo->type == VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER ||