Fix capacity overflow panic for huge --line-range offset-from-end#3855
Open
koopatroopa787 wants to merge 1 commit into
Open
Fix capacity overflow panic for huge --line-range offset-from-end#3855koopatroopa787 wants to merge 1 commit into
koopatroopa787 wants to merge 1 commit into
Conversation
`--line-range :-N` with N near usize::MAX aborted with "capacity overflow" in two ways: 1. `largest_offset_from_end() + 1` overflowed usize when N == usize::MAX. 2. `VecDeque::with_capacity(usize::MAX)` panicked with capacity overflow. Replace the plain `+ 1` with `saturating_add(1)` and the infallible `VecDeque::with_capacity` with `try_reserve`, so an impossibly large offset produces a clear error message instead of an abort. Fixes sharkdp#3845
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.
Summary
bat --line-range :-NwithNnearusize::MAXaborted withcapacity overflow(exit 101) instead of reporting an error:Two bugs combined to cause this:
largest_offset_from_end() + 1incontroller.rs:262overflowedusizewhen the offset wasusize::MAX.VecDeque::with_capacity(usize::MAX)aborted with capacity overflow for theusize::MAX - 1case.Fix
+ 1withsaturating_add(1)to prevent integer overflow.VecDeque::with_capacitywithVecDeque::new()+try_reserve, which returns an error instead of panicking when the requested capacity can't be represented.After the fix:
Normal
:-Nranges continue to work unchanged.Fixes #3845