Skip to content

Commit d29e98f

Browse files
authored
Rollup merge of #90010 - rusticstuff:vecdeque_with_capacity_in_overflow, r=m-ou-se
Avoid overflow in `VecDeque::with_capacity_in()`. The overflow only happens if alloc is compiled with overflow checks enabled and the passed capacity is greater or equal 2^(usize::BITS-1). The overflow shadows the expected "capacity overflow" panic leading to a test failure if overflow checks are enabled for std in the CI. Unblocks [CI: Enable overflow checks for test (non-dist) builds #89776](#89776). For some reason the overflow is only observable with optimization turned off, but that is a separate issue.
2 parents 20687bb + 4a37b9c commit d29e98f

File tree

1 file changed

+1
-1
lines changed
  • library/alloc/src/collections/vec_deque

1 file changed

+1
-1
lines changed

library/alloc/src/collections/vec_deque/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -543,9 +543,9 @@ impl<T, A: Allocator> VecDeque<T, A> {
543543
/// ```
544544
#[unstable(feature = "allocator_api", issue = "32838")]
545545
pub fn with_capacity_in(capacity: usize, alloc: A) -> VecDeque<T, A> {
546+
assert!(capacity < 1_usize << usize::BITS - 1, "capacity overflow");
546547
// +1 since the ringbuffer always leaves one space empty
547548
let cap = cmp::max(capacity + 1, MINIMUM_CAPACITY + 1).next_power_of_two();
548-
assert!(cap > capacity, "capacity overflow");
549549

550550
VecDeque { tail: 0, head: 0, buf: RawVec::with_capacity_in(cap, alloc) }
551551
}

0 commit comments

Comments
 (0)