Skip to content
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.

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

exrcheck: reduceMemory now checks pixel size and scanline compression mode #987

Conversation

peterhillman
Copy link
Contributor

Address https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=32370

Apply same logic as #966 to scanlines: when 'reduceMemory' is passed to Imf::CheckOpenEXRFile, computes the amount of memory to read scanline files. Previously only the scanline width was used. This change also accounts the number of scanlines stored in one chunk, which is compression-scheme dependent, and the number of bytes per pixel.

Signed-off-by: Peter Hillman peterh@wetafx.co.nz

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
Copy link
Member

@cary-ilm cary-ilm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@cary-ilm cary-ilm merged commit 0b07c14 into AcademySoftwareFoundation:master Mar 25, 2021
cary-ilm pushed a commit that referenced this pull request Mar 28, 2021
… mode (#987)

* exrcheck: reduceMemory checks pixel size and scanline compression mode

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>

* exrcheck: increase limit for scanlines in reduceMemory mode

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
@cary-ilm
Copy link
Member

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants