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

Don't crash on reading an unexpected amount of padding

Browse Source 
* The connection is likely lost/corrupted, but we shouldn't crash
This commit is contained in:
baldurk
2019-09-20 12:30:44 +01:00
parent c67995b85a
commit 21bfddf2af
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/core/replay_proxy.cpp
+7 -4
View File
@@ -1813,8 +1813,6 @@ void DoSerialise(SerialiserType &ser, DeltaSection &el)
template <typename SerialiserType>
void ReplayProxy::DeltaTransferBytes(SerialiserType &xferser, bytebuf &referenceData, bytebuf &newData)
{
char empty[128] = {};
// we use a list so that we don't have to reserve and pushing new sections will never cause
// previous ones to be reallocated and move around lots of data.
std::list<DeltaSection> deltas;
@@ -1844,10 +1842,13 @@ void ReplayProxy::DeltaTransferBytes(SerialiserType &xferser, bytebuf &reference
// add any necessary padding.
uint64_t offs = ser.GetReader()->GetOffset();
RDCASSERT(offs <= uncompSize, offs, uncompSize);
RDCASSERT(uncompSize - offs < sizeof(empty), offs, uncompSize);
if(offs < uncompSize)
ser.GetReader()->Read(empty, uncompSize - offs);
{
if(uncompSize - offs > 128)
RDCERR("Unexpected amount of padding: %llu", uncompSize - offs);
ser.GetReader()->Read(NULL, uncompSize - offs);
}
}
if(deltas.empty())
@@ -2028,6 +2029,8 @@ void ReplayProxy::DeltaTransferBytes(SerialiserType &xferser, bytebuf &reference
SERIALISE_ELEMENT(deltas);
char empty[128] = {};
// add any necessary padding.
uint64_t offs = ser.GetWriter()->GetOffset();
RDCASSERT(offs <= uncompSize, offs, uncompSize);