Fix issue 1057 + improve llvm/state.rs code #1058
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
… everywhere needed in state.rs
nlewycky
reviewed
Dec 11, 2019
| let index = self | ||
| .control_stack | ||
| .len() | ||
| .checked_sub(1 + (depth as usize)) |
| let index = self | ||
| .control_stack | ||
| .len() | ||
| .checked_sub(1 + (depth as usize)) |
There was a problem hiding this comment.
.checked_sub(1)
.checked_sub(depth as usize)
?
There was a problem hiding this comment.
Not possible because checked_sub return an Option.
Do you prefer this way?
let tmp_index = self
.control_stack
.len()
.checked_sub(1).ok_or(BinaryReaderError {
message: "frame_at_depth: invalid control stack depth",
offset: -1isize as usize,
})?;
let index = tmp_index.checked_sub(depth as usize)
.ok_or(BinaryReaderError {
message: "frame_at_depth: invalid control stack depth",
offset: -1isize as usize,
})?;
Ok(&self.control_stack[index])There was a problem hiding this comment.
Doh! No, I prefer the code as it is, thanks.
There was a problem hiding this comment.
It should be possible to use .and_then here. I noticed the potential for overflow there too, but I figured it's very unlikely. I think it should be fine as-is!
For future readers who may end up here who didn't understand what I meant:
self
.control_stack
.len()
.checked_sub(1)
.and_then(|n| n.checked_sub(depth as usize))
.ok_or(BinaryReaderError {
message: "frame_at_depth: invalid control stack depth",
offset: -1isize as usize,
})?;and_then acts like Monadic bind (>>=) in Haskell.
nlewycky
approved these changes
Dec 12, 2019
| let index = self | ||
| .control_stack | ||
| .len() | ||
| .checked_sub(1 + (depth as usize)) |
There was a problem hiding this comment.
Doh! No, I prefer the code as it is, thanks.
|
bors r+ |
Merge conflict |
|
bors r+ |
bors bot
added a commit
that referenced
this pull request
Dec 12, 2019
1058: Fix issue 1057 + improve llvm/state.rs code r=syrusakbary a=pventuzelo # Description This pull request is doing: - Fix issue #1057 (subtraction overflow panic in State::peek1_extra) by using `checked_sub` - replace other part of `state.rs` subject to potential substration overflow with `checked_sub` - add more detail on the Errors messages in `state.rs` - rename some variable for better understanding of the code. # Review - [x] Add a short description of the the change to the CHANGELOG.md file Co-authored-by: Patrick Ventuzelo <[email protected]> Co-authored-by: Syrus Akbary <[email protected]>
Build succeeded |
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
This pull request is doing:
checked_substate.rssubject to potential substration overflow withchecked_substate.rsReview