prevent overflow in bytesPerDeepLineTable #1152
Merged
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
Signed-off-by: Peter Hillman <[email protected]>
cary-ilm
reviewed
Sep 20, 2021
src/lib/OpenEXR/ImfMisc.cpp
Outdated
| @@ -131,7 +131,7 @@ bytesPerDeepLineTable (const Header &header, | |||
| { | |||
| const int ySampling = abs(c.channel().ySampling); | |||
| const int xSampling = abs(c.channel().xSampling); | |||
| const int pixelSize = pixelTypeSize (c.channel().type); | |||
| uint64_t pixelSize = pixelTypeSize (c.channel().type); | |||
There was a problem hiding this comment.
Did you remove the "const" for a reason?
There was a problem hiding this comment.
Oops. It's back again
Signed-off-by: Peter Hillman <[email protected]>
cary-ilm
pushed a commit
to cary-ilm/openexr
that referenced
this pull request
Sep 23, 2021
…1152) * prevent overflow in bytesPerDeepLineTable Signed-off-by: Peter Hillman <[email protected]> * restore zapped 'const' from ImfMisc Signed-off-by: Peter Hillman <[email protected]>
cary-ilm
pushed a commit
that referenced
this pull request
Sep 29, 2021
* prevent overflow in bytesPerDeepLineTable Signed-off-by: Peter Hillman <[email protected]> * restore zapped 'const' from ImfMisc Signed-off-by: Peter Hillman <[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=38912
bytesPerDeepLineTable() used
intto compute the number of uncompressed bytes per scanline for each channel, which could overflow. Switching touint64_tshould prevent this.This also switches internal computation from size_t` to uint64_t and add an overflow test for architectures where size_t is less than 64 bits.
Signed-off-by: Peter Hillman [email protected]