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

Catch and try to more gracefully handle invalid DDS files

Browse Source
This commit is contained in:
baldurk
2023-06-05 16:21:19 +01:00
parent f87aa7a7fe
commit 00dcec8a25
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/common/dds_readwrite.cpp
+13 -5
View File
@@ -1215,12 +1215,20 @@ RDResult load_dds_from_file(StreamReader *reader, read_dds_data &ret)
}
}
if(uint64_t(ret.slices) > fileSize || uint64_t(ret.mips) > fileSize ||
uint64_t(ret.slices) * ret.mips > fileSize)
// catch any invalid dimensions here, including the total dimension with a very conservative 1/16
// byte per pixel
if(uint64_t(ret.width) > fileSize || uint64_t(ret.height) > fileSize ||
uint64_t(ret.depth) > fileSize || uint64_t(ret.slices) > fileSize ||
uint64_t(ret.mips) > fileSize || uint64_t(ret.slices) * ret.mips > fileSize ||
(uint64_t(ret.width) * uint64_t(ret.height) * uint64_t(ret.depth) *
RDCMAX(uint64_t(ret.slices), uint64_t(ret.depth))) /
16 >
fileSize)
{
RETURN_ERROR_RESULT(ResultCode::ImageUnsupported,
"Invalid slice count %u or mip count %u loaded from DDS of size %llu",
ret.slices, ret.mips, fileSize);
RETURN_ERROR_RESULT(
ResultCode::ImageUnsupported,
"Invalid dimension (%ux%ux%u) slice count %u or mip count %u loaded from DDS of size %llu",
ret.width, ret.height, ret.depth, ret.slices, ret.mips, fileSize);
}
// we reserve space for a full mip-chain (twice the size of the top mip) just to be conservative