-
Notifications
You must be signed in to change notification settings - Fork 282
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
Use vector::at() rather than operator[] #1735
Merged
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
kevinbackhouse
added
the
forward-to-main
Forward changes in a 0.28.x PR to main with Mergify
label
Jun 21, 2021
hassec
reviewed
Jun 22, 2021
hassec
reviewed
Jun 22, 2021
hassec
approved these changes
Jun 25, 2021
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! 👍
hassec
added a commit
that referenced
this pull request
Jun 27, 2021
* fix: use vector::at() rather than operator[] (#1735) * Regression test for #1706 * Use vector::at() rather than operator[]. * Print to stderr when exception is caught and EXIV2_DEBUG_MESSAGES is enabled. * Check that it prints "Bad value" for the date. (cherry picked from commit f4d3adb) # Conflicts: # src/value.cpp * fix merge conflicts from mergify backport Co-authored-by: Kevin Backhouse <kevinbackhouse@github.com> Co-authored-by: Christoph Hasse <hassec@users.noreply.github.com>
This is the CodeQL query that I used to find the similar
|
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 #1706
The problem in #1706 is that
PentaxMakerNote::printDate()
expects a value of typeundefined
, but it is given a value of typeunsignedLong
instead. That leads to an out-of-bounds access of a std::vector, which triggers an assertion failure.It looks difficult to prevent
printDate
, and similar functions likeprintTime
, from getting called on values with the wrong type. So I think the most reliable way of preventing a crash is by usingvector::at()
rather thanoperator[]
. The difference is thatvector::at()
throws an exception if the index is out-of-bounds. It is easy to catch the exception and handle the error gracefully.