Rollup merge of #80003 - Stupremee:fix-zst-vecdeque-conversion-panic, r=dtolnay
Fix overflow when converting ZST Vec to VecDeque ```rust let v = vec![(); 100]; let queue = VecDeque::from(v); println!("{:?}", queue); ``` This code will currently panic with a capacity overflow. This PR resolves this issue and makes the code run fine. Resolves #78532
This commit is contained in:
commit
2e9ed6fb93
2 changed files with 13 additions and 2 deletions
|
@ -2793,8 +2793,12 @@ impl<T> From<Vec<T>> for VecDeque<T> {
|
||||||
let len = other.len();
|
let len = other.len();
|
||||||
|
|
||||||
// We need to extend the buf if it's not a power of two, too small
|
// We need to extend the buf if it's not a power of two, too small
|
||||||
// or doesn't have at least one free space
|
// or doesn't have at least one free space.
|
||||||
if !buf.capacity().is_power_of_two()
|
// We check if `T` is a ZST in the first condition,
|
||||||
|
// because `usize::MAX` (the capacity returned by `capacity()` for ZST)
|
||||||
|
// is not a power of two and thus it'll always try
|
||||||
|
// to reserve more memory which will panic for ZST (rust-lang/rust#78532)
|
||||||
|
if (!buf.capacity().is_power_of_two() && mem::size_of::<T>() != 0)
|
||||||
|| (buf.capacity() < (MINIMUM_CAPACITY + 1))
|
|| (buf.capacity() < (MINIMUM_CAPACITY + 1))
|
||||||
|| (buf.capacity() == len)
|
|| (buf.capacity() == len)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1728,3 +1728,10 @@ fn test_zero_sized_push() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_from_zero_sized_vec() {
|
||||||
|
let v = vec![(); 100];
|
||||||
|
let queue = VecDeque::from(v);
|
||||||
|
assert_eq!(queue.len(), 100);
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue