lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 17:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to handle invalid callstack sizes in serialisation without crashing

Browse Source
This commit is contained in:
baldurk
2019-09-19 11:47:11 +01:00
parent 78fba8ec57
commit 0e1c20342e
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/serialise/serialiser.cpp
+13 -3
View File
@@ -85,10 +85,20 @@ uint32_t Serialiser<SerialiserMode::Reading>::BeginChunk(uint32_t, uint64_t)
uint32_t numFrames = 0;
m_Read->Read(numFrames);
m_ChunkMetadata.flags |= SDChunkFlags::HasCallstack;
// try to sanity check the number of frames
if(numFrames < 4096)
{
m_ChunkMetadata.flags |= SDChunkFlags::HasCallstack;
m_ChunkMetadata.callstack.resize((size_t)numFrames);
m_Read->Read(m_ChunkMetadata.callstack.data(), m_ChunkMetadata.callstack.byteSize());
m_ChunkMetadata.callstack.resize((size_t)numFrames);
m_Read->Read(m_ChunkMetadata.callstack.data(), m_ChunkMetadata.callstack.byteSize());
}
else
{
RDCERR("Read invalid number of callstack frames: %u", numFrames);
// still read the size that we should, even though we expect this to be broken after here
m_Read->Read(NULL, numFrames * sizeof(uint64_t));
}
}
if(c & ChunkThreadID)