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

Don't underflow when reading padding if serialiser is in an error state

Browse Source
This commit is contained in:
baldurk
2019-02-15 11:28:27 +00:00
parent 982ef03fd1
commit 9ee4795948
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/replay_proxy.cpp
+12 -6
View File
@@ -814,7 +814,8 @@ void ReplayProxy::Proxied_GetBufferData(ParamSerialiser &paramser, ReturnSeriali
RDCASSERT(offs <= dataSize, offs, dataSize);
RDCASSERT(dataSize - offs < sizeof(empty), offs, dataSize);
ser.GetReader()->Read(empty, dataSize - offs);
if(offs < dataSize)
ser.GetReader()->Read(empty, dataSize - offs);
}
else
{
@@ -828,7 +829,8 @@ void ReplayProxy::Proxied_GetBufferData(ParamSerialiser &paramser, ReturnSeriali
RDCASSERT(offs <= dataSize, offs, dataSize);
RDCASSERT(dataSize - offs < sizeof(empty), offs, dataSize);
ser.GetWriter()->Write(empty, dataSize - offs);
if(offs < dataSize)
ser.GetWriter()->Write(empty, dataSize - offs);
}
retser.EndChunk();
@@ -891,7 +893,8 @@ void ReplayProxy::Proxied_GetTextureData(ParamSerialiser &paramser, ReturnSerial
RDCASSERT(offs <= dataSize, offs, dataSize);
RDCASSERT(dataSize - offs < sizeof(empty), offs, dataSize);
ser.GetReader()->Read(empty, dataSize - offs);
if(offs < dataSize)
ser.GetReader()->Read(empty, dataSize - offs);
}
else
{
@@ -905,7 +908,8 @@ void ReplayProxy::Proxied_GetTextureData(ParamSerialiser &paramser, ReturnSerial
RDCASSERT(offs <= dataSize, offs, dataSize);
RDCASSERT(dataSize - offs < sizeof(empty), offs, dataSize);
ser.GetWriter()->Write(empty, dataSize - offs);
if(offs < dataSize)
ser.GetWriter()->Write(empty, dataSize - offs);
}
retser.EndChunk();
@@ -1790,7 +1794,8 @@ void ReplayProxy::DeltaTransferBytes(SerialiserType &xferser, bytebuf &reference
RDCASSERT(offs <= uncompSize, offs, uncompSize);
RDCASSERT(uncompSize - offs < sizeof(empty), offs, uncompSize);
ser.GetReader()->Read(empty, uncompSize - offs);
if(offs < uncompSize)
ser.GetReader()->Read(empty, uncompSize - offs);
}
if(deltas.empty())
@@ -1976,7 +1981,8 @@ void ReplayProxy::DeltaTransferBytes(SerialiserType &xferser, bytebuf &reference
RDCASSERT(offs <= uncompSize, offs, uncompSize);
RDCASSERT(uncompSize - offs < sizeof(empty), offs, uncompSize);
ser.GetWriter()->Write(empty, uncompSize - offs);
if(offs < uncompSize)
ser.GetWriter()->Write(empty, uncompSize - offs);
}
// This is the proxy side, so we have the complete newest contents in data. Swap the new data