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

Add safety to satisfy Coverity on some errors that are likely impossible

Browse Source 
* Reported by Coverity Scan
This commit is contained in:
baldurk
2017-11-22 19:11:14 +00:00
parent 25ea14c965
commit 9e5cfa8b96
15 changed files with 142 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/common/shader_cache.h
+66 -55
View File
@@ -68,65 +68,76 @@ bool LoadShaderCache(const char *filename, const uint32_t magicNumber, const uin
{
uint32_t numentries = header[2];
byte *ptr = cache + sizeof(uint32_t) * 3;
int64_t bufsize = (int64_t)cachelen - sizeof(uint32_t) * 3;
for(uint32_t i = 0; i < numentries; i++)
// assume at least 16 bytes for any cache entry. 8 bytes for hash and length, and 8 bytes
// data.
if(numentries > cachelen / 16LLU)
{
if((size_t)bufsize < sizeof(uint32_t))
{
RDCERR("Invalid shader cache - truncated, not enough data for shader hash");
ret = false;
break;
}
uint32_t hash = *(uint32_t *)ptr;
ptr += sizeof(uint32_t);
bufsize -= sizeof(uint32_t);
if((size_t)bufsize < sizeof(uint32_t))
{
RDCERR("Invalid shader cache - truncated, not enough data for shader length");
ret = false;
break;
}
uint32_t len = *(uint32_t *)ptr;
ptr += sizeof(uint32_t);
bufsize -= sizeof(uint32_t);
if(bufsize < len)
{
RDCERR("Invalid shader cache - truncated, not enough data for shader buffer");
ret = false;
break;
}
byte *data = ptr;
ptr += len;
bufsize -= len;
ResultType result;
bool created = callbacks.Create(len, data, &result);
if(!created)
{
RDCERR("Couldn't create blob of size %u from shadercache", len);
ret = false;
break;
}
resultCache[hash] = result;
}
if(ret == true && bufsize != 0)
{
RDCERR("Invalid shader cache - trailing data");
RDCERR("Invalid shader cache - more entries %u than are feasible in a %llu byte cache",
numentries, cachelen);
ret = false;
}
else
{
byte *ptr = cache + sizeof(uint32_t) * 3;
RDCDEBUG("Successfully loaded %d shaders from shader cache", resultCache.size());
int64_t bufsize = (int64_t)cachelen - sizeof(uint32_t) * 3;
for(uint32_t i = 0; i < numentries; i++)
{
if((size_t)bufsize < sizeof(uint32_t))
{
RDCERR("Invalid shader cache - truncated, not enough data for shader hash");
ret = false;
break;
}
uint32_t hash = *(uint32_t *)ptr;
ptr += sizeof(uint32_t);
bufsize -= sizeof(uint32_t);
if((size_t)bufsize < sizeof(uint32_t))
{
RDCERR("Invalid shader cache - truncated, not enough data for shader length");
ret = false;
break;
}
uint32_t len = *(uint32_t *)ptr;
ptr += sizeof(uint32_t);
bufsize -= sizeof(uint32_t);
if(bufsize < len)
{
RDCERR("Invalid shader cache - truncated, not enough data for shader buffer");
ret = false;
break;
}
byte *data = ptr;
ptr += len;
bufsize -= len;
ResultType result;
bool created = callbacks.Create(len, data, &result);
if(!created)
{
RDCERR("Couldn't create blob of size %u from shadercache", len);
ret = false;
break;
}
resultCache[hash] = result;
}
if(ret == true && bufsize != 0)
{
RDCERR("Invalid shader cache - trailing data");
ret = false;
}
RDCDEBUG("Successfully loaded %d shaders from shader cache", resultCache.size());
}
}
delete[] cache;
renderdoc/common/wrapped_pool.h
+2 -1
View File
@@ -225,7 +225,8 @@ private:
allocated[idx] = false;
#if ENABLED(RDOC_DEVEL)
memset(p, 0xfe, DebugClear ? AllocByteSize : 0);
if(DebugClear)
memset(p, 0xfe, AllocByteSize);
#endif
}