Repository navigation
Check drain range bounds without overflowing - #104
Open
RaphaelFakhri wants to merge 1 commit into
Open
RaphaelFakhri wants to merge 1 commit into
RaphaelFakhri wants to merge 1 commit into
Conversation
`drain` and `splice` added 1 to an excluded start bound or an included end bound without checking for overflow. In release builds, `drain((Excluded(usize::MAX), Unbounded))` drained the whole vector and `drain(..=usize::MAX)` drained nothing, instead of panicking like `Vec::drain`. Move the `slice_range` helper out of `extract_if` and use it in `drain` too. Fixes mozilla#102
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
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 #102.
Problem
ThinVec::drain(andsplice, which calls it) adds 1 to an excluded start bound or an included end bound without an overflow check. In release builds the addition wraps:drain((Bound::Excluded(usize::MAX), Bound::Unbounded))drains every element.drain(..=usize::MAX)drains nothing.Vec::drainandThinVec::extract_ifpanic for both ranges. Debug builds panic withattempt to add with overflow.Change
slice_rangeandslice_index_failhelpers out ofextract_ifto module scope, unchanged.drainnow callsslice_range(range, ..len), the same wayextract_ifdoes. Invalid ranges panic with the same messages asVec.Boundimport, which is now unused.Tests
Adds
test_drain_excluded_usize_max_startandtest_drain_inclusive_usize_max_end. Both fail before the change, in debug and release builds, and pass after it.cargo fmt --check,cargo clippy --workspace --tests --examples, and the CI test commands (default,serde,gecko-ffi,--no-default-features) all pass.