Fix bounds check on number of descriptor sets

baldurk · baldurk · commit 16c440776df3 · 2024-07-16T11:00:37.000+01:00
diff --git a/renderdoc/driver/vulkan/vk_shader_feedback.cpp b/renderdoc/driver/vulkan/vk_shader_feedback.cpp
@@ -1702,7 +1702,7 @@ bool VulkanReplay::FetchShaderFeedback(uint32_t eventId)
       key.index.index = index;
       key.index.arrayElement = 0;
 
-      if(bindset >= descLayouts.size() || !descLayouts[bindset] || bindset > descSets.size() ||
+      if(bindset >= descLayouts.size() || !descLayouts[bindset] || bindset >= descSets.size() ||
          descSets[bindset].descSet == ResourceId())
       {
         RDCERR("Invalid set %u referenced by %s shader", bindset, ToStr(key.stage).c_str());

Original file line number	Diff line number	Diff line change
`@@ -1702,7 +1702,7 @@ bool VulkanReplay::FetchShaderFeedback(uint32_t eventId)`
`1702`	`1702`	`key.index.index = index;`
`1703`	`1703`	`key.index.arrayElement = 0;`
`1704`	`1704`
`1705`		`- if(bindset >= descLayouts.size() \|\| !descLayouts[bindset] \|\| bindset > descSets.size() \|\|`
	`1705`	`+ if(bindset >= descLayouts.size() \|\| !descLayouts[bindset] \|\| bindset >= descSets.size() \|\|`
`1706`	`1706`	`descSets[bindset].descSet == ResourceId())`
`1707`	`1707`	`{`
`1708`	`1708`	`RDCERR("Invalid set %u referenced by %s shader", bindset, ToStr(key.stage).c_str());`