lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-22 22:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pixel history potential use-after-free

Browse Source 
* After resizing history events for overdraw the modification reference may no
  longer be valid.
This commit is contained in:
baldurk
2024-10-04 10:31:56 +01:00
parent 5d0a85e8ca
commit cb1a2926fa
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/d3d12/d3d12_pixelhistory.cpp
+8 -3
View File
@@ -2978,6 +2978,7 @@ rdcarray<PixelModification> D3D12Replay::PixelHistory(rdcarray<EventUsage> event
{
PixelModification &mod = history[h];
uint32_t eid = mod.eventId;
int32_t eventIndex = cb.GetEventIndex(mod.eventId);
if(eventIndex == -1)
{
@@ -3036,10 +3037,14 @@ rdcarray<PixelModification> D3D12Replay::PixelHistory(rdcarray<EventUsage> event
eventPremods[mod.eventId] = mod.preMod;
}
for(int32_t f = 1; f < frags; f++)
{
history.insert(h + 1, mod);
PixelModification duplicate = mod;
for(int32_t f = 1; f < frags; f++)
{
history.insert(h + 1, duplicate);
}
}
for(int32_t f = 0; f < frags; f++)
history[h + f].fragIndex = f;
h += RDCMAX(1, frags);
@@ -3047,7 +3052,7 @@ rdcarray<PixelModification> D3D12Replay::PixelHistory(rdcarray<EventUsage> event
"PixelHistory event id: %u, fixed shader stencilValue = %u, "
"original shader stencilValue = "
"%u",
mod.eventId, ei.dsWithoutShaderDiscard[0], ei.dsWithShaderDiscard[0]);
eid, ei.dsWithoutShaderDiscard[0], ei.dsWithShaderDiscard[0]);
}
if(eventsWithFrags.size() > 0)
renderdoc/driver/vulkan/vk_pixelhistory.cpp
+2 -1
View File
@@ -4627,6 +4627,7 @@ rdcarray<PixelModification> VulkanReplay::PixelHistory(rdcarray<EventUsage> even
{
PixelModification &mod = history[h];
uint32_t eid = mod.eventId;
int32_t eventIndex = cb.GetEventIndex(mod.eventId);
if(eventIndex == -1)
{
@@ -4685,7 +4686,7 @@ rdcarray<PixelModification> VulkanReplay::PixelHistory(rdcarray<EventUsage> even
RDCDEBUG(
"PixelHistory event id: %u, fixed shader stencilValue = %u, original shader stencilValue = "
"%u",
mod.eventId, ei.dsWithoutShaderDiscard[4], ei.dsWithShaderDiscard[4]);
eid, ei.dsWithoutShaderDiscard[4], ei.dsWithShaderDiscard[4]);
}
m_pDriver->vkUnmapMemory(dev, resources.bufferMemory);