Skip to content

Reject DWA RLE and UNKNOWN streams shorter than required channel data. #2545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cary-ilm wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −0
Open

Reject DWA RLE and UNKNOWN streams shorter than required channel data. #2545

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/lib/OpenEXRCore/internal_dwa_compressor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -688,6 +688,33 @@ DwaCompressor_compress (DwaCompressor* me)

/**************************************/

exr_result_t
validate_size(DwaCompressor* me, CompressorScheme compression,
uint64_t compressedSize, uint64_t uncompressedSize,
uint64_t extraSize)
{
uint64_t requiredSize = 0;
for (int c = 0; c < me->_numChannels; ++c)
{
if (me->_channelData[c].compression == compression)
requiredSize += (uint64_t) me->_channelData[c].planarUncSize;
}

if (requiredSize > 0)
{
if (uncompressedSize < requiredSize || compressedSize == 0)
{
return EXR_ERR_CORRUPT_CHUNK;
}
}
else if (uncompressedSize > 0 || compressedSize > 0 || extraSize > 0)
{
return EXR_ERR_CORRUPT_CHUNK;
}

return EXR_ERR_SUCCESS;
}

exr_result_t
DwaCompressor_uncompress (
DwaCompressor* me,
Expand Down Expand Up @@ -867,6 +894,12 @@ DwaCompressor_uncompress (
rv = DwaCompressor_setupChannelData (me);
if (rv != EXR_ERR_SUCCESS) { return rv; }

rv = validate_size(me, UNKNOWN, unknownCompressedSize, unknownUncompressedSize, 0);
if (rv != EXR_ERR_SUCCESS) { return rv; }

rv = validate_size(me, RLE, rleCompressedSize, rleRawSize, rleUncompressedSize);
if (rv != EXR_ERR_SUCCESS) { return rv; }

//
// Uncompress the UNKNOWN data into _planarUncBuffer[UNKNOWN]
//
Expand Down
Loading