Added check for integer overflow in get_num_images #1397
Merged
rouault merged 28 commits intouclouvain:masterfrom Jan 15, 2022
Merged
Added check for integer overflow in get_num_images #1397rouault merged 28 commits intouclouvain:masterfrom
rouault merged 28 commits intouclouvain:masterfrom
Conversation
…press, opj_dump. See comment on commit 79c7d7a.
Removed automatically generated settings.json
This reverts commit e74ee84.
…d for conformity, relocated check for num images for exicution before allocation and image loading
This reverts commit dbe64d6.
… unsigned for conformity, relocated check for num images for exicution before allocation and image loading" This reverts commit ab6c7c7.
Added overflow protection in get_num_images function, redefined num_images to unsigned int in compress and decompress to match dump
…t exicution of allocation and strcpy if there are no images.
rouault
reviewed
Jan 14, 2022
…lue for get_num_images
Contributor
Author
|
@rouault I made the requested revisions. I was under the impression that unsigned overflow was always defined behavior. Thank you for the feedback. |
rouault
reviewed
Jan 14, 2022
Contributor
Author
|
Added the return statement after the overflow check. I don't know how I managed to mess up copy paste. |
|
hey there, Are these fixes anyhow related with CVE-2021-29338 ? Should it have another CVE assigned to these fixes/commits in this merge? Thanks! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
As discussed in pull request 1396, added a check for integer overflow.
Change list:
Defined num_images as unsigned int
Moved the if statement to check for an empty directory to the beginning of the read directory section
Added a check to see if num images rolls back to zero when incrementing.