-
Notifications
You must be signed in to change notification settings - Fork 624
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
sanity check ScanlineInput bytesPerLine instead of lineOffset size #863
Merged
cary-ilm
merged 3 commits into
AcademySoftwareFoundation:master
from
peterhillman:scanline_bytesperline_sanitycheck
Nov 19, 2020
Merged
sanity check ScanlineInput bytesPerLine instead of lineOffset size #863
cary-ilm
merged 3 commits into
AcademySoftwareFoundation:master
from
peterhillman:scanline_bytesperline_sanitycheck
Nov 19, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cary-ilm
reviewed
Nov 19, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
cary-ilm
added a commit
to cary-ilm/openexr
that referenced
this pull request
May 12, 2021
…cademySoftwareFoundation#863) Signed-off-by: Peter Hillman <[email protected]> Co-authored-by: Cary Phillips <[email protected]> Signed-off-by: Cary Phillips <[email protected]>
cary-ilm
added a commit
to cary-ilm/openexr
that referenced
this pull request
May 12, 2021
…cademySoftwareFoundation#863) Signed-off-by: Peter Hillman <[email protected]> Co-authored-by: Cary Phillips <[email protected]> Signed-off-by: Cary Phillips <[email protected]>
cary-ilm
added a commit
that referenced
this pull request
May 16, 2021
* double-check unpackedBuffer created in DWA uncompress Signed-off-by: Peter Hillman <[email protected]> Signed-off-by: Cary Phillips <[email protected]> * compute Huf codelengths using 64 bit to prevent shift overflow Signed-off-by: Peter Hillman <[email protected]> Signed-off-by: Cary Phillips <[email protected]> * Avoid overflow in calculateNumTiles when size=MAX_INT (#825) * Avoid overflow in calculateNumTiles when size=MAX_INT Signed-off-by: Cary Phillips <[email protected]> * Compute level size with 64 bits to avoid overflow Signed-off-by: Cary Phillips <[email protected]> * More efficient handling of filled channels reading tiles with scanline API (#830) * refactor channel filling in InputFile API with tiled source Signed-off-by: Peter Hillman <[email protected]> * handle edge-case of empty framebuffer Signed-off-by: Peter Hillman <[email protected]> Signed-off-by: Cary Phillips <[email protected]> * fix undefined behavior: ignore unused bits in B44 mode detection (#832) Signed-off-by: Peter Hillman <[email protected]> Signed-off-by: Cary Phillips <[email protected]> * Fix overflow computing deeptile sample table size (#861) Signed-off-by: Peter Hillman <[email protected]> Signed-off-by: Cary Phillips <[email protected]> * sanity check ScanlineInput bytesPerLine instead of lineOffset size (#863) Signed-off-by: Peter Hillman <[email protected]> Co-authored-by: Cary Phillips <[email protected]> Signed-off-by: Cary Phillips <[email protected]> * Release notes for v2.4.3 Signed-off-by: Cary Phillips <[email protected]> * Bump version for v2.4.3 Signed-off-by: Cary Phillips <[email protected]> * reduce size limit for scanline files; prevent large chunkoffset allocations (#824) * reduce size limit for scanline files; protect against large chunkoffset allocations Signed-off-by: Peter Hillman <[email protected]> * bugfix for memory limit changes Signed-off-by: Peter Hillman <[email protected]> * rearrange chunkoffset test to protect bytesperline table too Signed-off-by: Peter Hillman <[email protected]> * remove extraneous function declaration; tidy comments Signed-off-by: Peter Hillman <[email protected]> Signed-off-by: Cary Phillips <[email protected]> * Change v2.4.3 release date to May 17, and clean up urls Signed-off-by: Cary Phillips <[email protected]> Co-authored-by: Peter Hillman <[email protected]>
cary-ilm
added a commit
that referenced
this pull request
May 17, 2021
…stead of lineOffset size This somehow went missing in the cherry-pick/merge. Signed-off-by: Cary Phillips <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Address https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=27409
Updates the filesize check added by #824 to files with a large number of scanlines, rather than a large number of chunks, giving more protection against very small specially crafted files causing large memory allocations.
#824 prevented large memory allocations for scanline offset tables in files which were too small to contain large tables. ScanLineInput files have a 'scanline offset table' (one per chunk) as well as 'bytesPerLine' and 'offsetInLineBuffer' tables (each one per scanline). DWAB files contain 256 scanlines per chunk, so can have a huge bytesPerLine table with only a moderate scanline offset table.
Signed-off-by: Peter Hillman [email protected]