bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Avoid a double drop in Vec::dedup if a destructor panics

Browse source
This commit is contained in:
Giacomo Stevanato 2021-05-24 12:41:13 +02:00
parent 13bf0b2a3c
commit e0c9719672
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
library/alloc/src/vec/mod.rs
View file

@ -1619,6 +1619,8 @@ impl<T, A: Allocator> Vec<T, A> {
let prev_ptr = ptr.add(gap.write.wrapping_sub(1));
if same_bucket(&mut *read_ptr, &mut *prev_ptr) {
// Increase `gap.read` now since the drop may panic.
gap.read += 1;
/* We have found duplicate, drop it in-place */
ptr::drop_in_place(read_ptr);
} else {
@ -1631,9 +1633,8 @@ impl<T, A: Allocator> Vec<T, A> {
/* We have filled that place, so go further */
gap.write += 1;
gap.read += 1;
}
gap.read += 1;
}
/* Technically we could let `gap` clean up with its Drop, but