Fix incorrect loop condition #1752
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
hassec
approved these changes
Jun 30, 2021
kevinbackhouse
added
the
forward-to-main
mergify bot
pushed a commit
that referenced
this pull request
Jun 30, 2021
* Regression test for GHSA-mxw9-qx4c-6m8v * Fix incorrect loop condition. (cherry picked from commit 86d0a1d) # Conflicts: # src/jp2image.cpp
kevinbackhouse
added a commit
that referenced
this pull request
Jul 1, 2021
kevinbackhouse
added a commit
that referenced
this pull request
Jul 1, 2021
hassec
pushed a commit
that referenced
this pull request
Jul 1, 2021
Open
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.
Fixes GHSA-mxw9-qx4c-6m8v
The problem here is caused by
bWroteColor. It isfalseby default, but if it becomestruethen it can never revert back tofalse. When it becomestrue, the loop becomes infinite: it can only terminate by throwing an exception or by crashing. I am not completely sure what the intended logic was here, but my best guess is that the loop condition should use&&rather than||.I also fixed an unaligned pointer dereference that was causing an ASAN error.