Vec drop and truncate: drop using raw slice *mut [T]

By creating a *mut [T] directly (without going through &mut [T]), avoid
questions of validity of the contents of the slice.

Consider the following risky code:

```rust
unsafe {
    let mut v = Vec::<bool>::with_capacity(16);
    v.set_len(16);
}
```

The intention is that with this change, the above snippet will be
sound because Vec::drop does no longer produces a mutable slice of
the vector's contents.
This commit is contained in:
Ulrik Sverdrup 2020-04-14 21:35:37 +02:00
parent 6805906fba
commit 7612ad7797

View File

@ -741,7 +741,7 @@ pub fn truncate(&mut self, len: usize) {
return; return;
} }
let remaining_len = self.len - len; let remaining_len = self.len - len;
let s = slice::from_raw_parts_mut(self.as_mut_ptr().add(len), remaining_len); let s = ptr::slice_from_raw_parts_mut(self.as_mut_ptr().add(len), remaining_len);
self.len = len; self.len = len;
ptr::drop_in_place(s); ptr::drop_in_place(s);
} }
@ -2379,7 +2379,7 @@ unsafe impl<#[may_dangle] T> Drop for Vec<T> {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
// use drop for [T] // use drop for [T]
ptr::drop_in_place(&mut self[..]); ptr::drop_in_place(ptr::slice_from_raw_parts_mut(self.as_mut_ptr(), self.len))
} }
// RawVec handles deallocation // RawVec handles deallocation
} }