lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-12 16:55:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix use-after-free with dangling reference while splitting subresources

Browse Source
This commit is contained in:
baldurk
2019-12-19 21:50:13 +00:00
parent 27098f8f70
commit a0023d84cd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_manager.cpp
+7 -2
View File
@@ -125,10 +125,12 @@ void VulkanResourceManager::RecordSingleBarrier(
state.second.subresourceRange.levelCount = 1;
state.second.subresourceRange.layerCount = 1;
rdcpair<ResourceId, ImageRegionState> existing = state;
// insert new copies of the current state to expand out the subresources. Only insert
// count-1 as we want count entries total - one per subresource
for(size_t sub = 0; sub < count - 1; sub++)
dststates.insert(i, state);
dststates.insert(i, existing);
for(size_t sub = 0; sub < count; sub++)
{
@@ -736,10 +738,13 @@ void VulkanResourceManager::ApplyBarriers(uint32_t queueFamilyIndex,
state.subresourceRange.levelCount = 1;
state.subresourceRange.layerCount = 1;
// copy now, state will no longer be valid after inserting below
ImageRegionState existing = state;
// insert new copies of the current state to expand out the subresources. Only insert
// count-1 as we want count entries total - one per subresource
for(size_t sub = 0; sub < count - 1; sub++)
stit->second.subresourceStates.insert(i, state);
stit->second.subresourceStates.insert(i, existing);
for(size_t sub = 0; sub < count; sub++)
{