OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #69828 - RalfJung:vec-leak, r=kennytm 

fix memory leak when vec::IntoIter panics during drop

Fixes https://github.com/rust-lang/rust/issues/69770
This commit is contained in:
Mazdak Farrokhzad 2020-03-11 14:03:47 +01:00 committed by GitHub
parent 9674c09ae9 528cbc4879
commit 080d41391d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/liballoc/vec.rs
View File

@ -2626,13 +2626,21 @@ impl<T: Clone> Clone for IntoIter<T> {
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
unsafe impl<#[may_dangle] T> Drop for IntoIter<T> { unsafe impl<#[may_dangle] T> Drop for IntoIter<T> {
fn drop(&mut self) { fn drop(&mut self) {
// destroy the remaining elements struct DropGuard<'a, T>(&'a mut IntoIter<T>);
unsafe {
ptr::drop_in_place(self.as_mut_slice()); impl<T> Drop for DropGuard<'_, T> {
fn drop(&mut self) {
// RawVec handles deallocation
let _ = unsafe { RawVec::from_raw_parts(self.0.buf.as_ptr(), self.0.cap) };
}
} }
// RawVec handles deallocation let guard = DropGuard(self);
let _ = unsafe { RawVec::from_raw_parts(self.buf.as_ptr(), self.cap) }; // destroy the remaining elements
unsafe {
ptr::drop_in_place(guard.0.as_mut_slice());
}
// now `guard` will be dropped and do the rest
} }
} }