Prevent infinite loop in bit_range_convert #3996
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: Jesse Yurkovich <jesse.y@gmail.com>
lgritz
reviewed
Sep 26, 2023
| @@ -1229,6 +1229,7 @@ convert_type (const S &src) | |||
| /// shifted fully to the right. | |||
| template<unsigned int FROM_BITS, unsigned int TO_BITS> | |||
| inline OIIO_HOSTDEVICE unsigned int bit_range_convert(unsigned int in) { | |||
| static_assert(FROM_BITS > 0, "FROM_BITS cannot be 0"); | |||
There was a problem hiding this comment.
The static_assert makes it impossible to successfullyinstantiate the template with FROM_BITS == 0. So why is the if (FROM_BITS) necessary later on?
There was a problem hiding this comment.
There's 2 variations of bit_range_convert (1 template and 1 normal) and I suspect you're looking at the wrong one from the diff?
There was a problem hiding this comment.
Oh, right you are. My brain thought I was just looking later in the same template. My bad.
lgritz
approved these changes
Sep 26, 2023
lgritz
pushed a commit
to lgritz/OpenImageIO
that referenced
this pull request
Sep 27, 2023
…ation#3996) It was possible for `bit_range_convert` to be called with a 0 for the `FROM_BITS` parameter leading to an infinite loop in its processing. Fixes AcademySoftwareFoundation#3993: OIIO library freezes when loading R16G16 uncompressed DDS files The test image from the above bug is now able to be read correctly. Signed-off-by: Jesse Yurkovich <jesse.y@gmail.com>
lgritz
pushed a commit
to lgritz/OpenImageIO
that referenced
this pull request
Sep 27, 2023
…ation#3996) It was possible for `bit_range_convert` to be called with a 0 for the `FROM_BITS` parameter leading to an infinite loop in its processing. Fixes AcademySoftwareFoundation#3993: OIIO library freezes when loading R16G16 uncompressed DDS files The test image from the above bug is now able to be read correctly. Signed-off-by: Jesse Yurkovich <jesse.y@gmail.com>
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.
Description
It was possible for
bit_range_convertto be called with a 0 for theFROM_BITSparameter leading to an infinite loop in its processing.Fixes #3993
Tests
The test image from the above bug is now able to be read correctly.
Checklist:
(adding new test cases if necessary).
corresponding Python bindings (and if altering ImageBufAlgo functions, also
exposed the new functionality as oiiotool options).
already run clang-format before submitting, I definitely will look at the CI
test that runs clang-format and fix anything that it highlights as being
nonconforming.