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

When reading file, handle an empty or truncated header

Browse Source
This commit is contained in:
baldurk
2018-09-25 18:24:09 +01:00
parent fcb74d2f7c
commit b3c8c66a99
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/win32/win32_shellext.cpp
+28 -3
View File
@@ -152,10 +152,11 @@ struct RDCThumbnailProvider : public IThumbnailProvider, IInitializeWithStream
// old header.
const uint32_t MAGIC_HEADER = MAKE_FOURCC('R', 'D', 'O', 'C');
byte *readPtr = &captureHeader[0];
byte *readPtr = captureHeader.data();
byte *readEnd = readPtr + captureHeader.size();
if(memcmp(&MAGIC_HEADER, readPtr, sizeof(MAGIC_HEADER)))
if(captureHeader.size() < sizeof(MAGIC_HEADER) ||
memcmp(&MAGIC_HEADER, readPtr, sizeof(MAGIC_HEADER)))
{
RDCDEBUG("Legacy header did not have expected magic number");
return;
@@ -164,6 +165,9 @@ struct RDCThumbnailProvider : public IThumbnailProvider, IInitializeWithStream
// uint64_t MAGIC_HEADER
readPtr += sizeof(uint64_t);
if(readPtr + sizeof(uint32_t) >= readEnd)
return;
uint32_t version = 0;
memcpy(&version, readPtr, sizeof(version));
@@ -174,6 +178,9 @@ struct RDCThumbnailProvider : public IThumbnailProvider, IInitializeWithStream
{
readPtr += sizeof(uint64_t); // uint64_t filesize
if(readPtr + sizeof(uint64_t) >= readEnd)
return;
uint64_t resolveDBSize = 0;
memcpy(&resolveDBSize, readPtr, sizeof(resolveDBSize));
readPtr += sizeof(resolveDBSize);
@@ -185,9 +192,15 @@ struct RDCThumbnailProvider : public IThumbnailProvider, IInitializeWithStream
}
// now readPtr points to data
if(readPtr >= readEnd)
return;
}
else if(version == 0x32)
{
if(readPtr >= readEnd)
return;
// only support a binary capture section as the first section
if(*readPtr != '0')
{
@@ -197,6 +210,9 @@ struct RDCThumbnailProvider : public IThumbnailProvider, IInitializeWithStream
readPtr += sizeof(byte) * 4; // isASCII and 3 padding bytes
if(readPtr + sizeof(uint32_t) >= readEnd)
return;
uint32_t sectionFlags = 0;
memcpy(&sectionFlags, readPtr, sizeof(sectionFlags));
readPtr += sizeof(sectionFlags);
@@ -204,6 +220,9 @@ struct RDCThumbnailProvider : public IThumbnailProvider, IInitializeWithStream
readPtr += sizeof(uint32_t); // uint32_t sectionType
readPtr += sizeof(uint32_t); // uint32_t sectionLength
if(readPtr + sizeof(uint32_t) >= readEnd)
return;
uint32_t sectionNameLength = 0;
memcpy(&sectionNameLength, readPtr, sizeof(sectionNameLength));
readPtr += sizeof(sectionNameLength);
@@ -243,7 +262,7 @@ struct RDCThumbnailProvider : public IThumbnailProvider, IInitializeWithStream
captureHeader = uncompressed;
readPtr = &captureHeader[0];
readPtr = captureHeader.data();
readEnd = readPtr + captureHeader.size();
}
}
@@ -258,6 +277,9 @@ struct RDCThumbnailProvider : public IThumbnailProvider, IInitializeWithStream
// now we're at the first chunk. It should be THUMBNAIL_DATA
const uint16_t THUMBNAIL_DATA = 2;
if(readPtr + sizeof(uint16_t) >= readEnd)
return;
uint16_t chunkID = 0;
memcpy(&chunkID, readPtr, sizeof(chunkID));
readPtr += sizeof(chunkID);
@@ -270,6 +292,9 @@ struct RDCThumbnailProvider : public IThumbnailProvider, IInitializeWithStream
readPtr += sizeof(uint32_t); // uint32_t chunkSize
if(readPtr + sizeof(bool) + sizeof(uint32_t) * 3 >= readEnd)
return;
// contents we care about
bool hasThumbnail = false;
memcpy(&hasThumbnail, readPtr, sizeof(hasThumbnail));