Skip to content

Commit

Permalink
VecDeque::drain: make sure the 'drain' raw pointer is actually still …
Browse files Browse the repository at this point in the history
…usable
  • Loading branch information
RalfJung committed Dec 7, 2018
1 parent 21b5950 commit b0c4a35
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/liballoc/collections/vec_deque.rs
Expand Up @@ -1019,14 +1019,19 @@ impl<T> VecDeque<T> {
// the drain is complete and the Drain destructor is run.
self.head = drain_tail;

// `deque` and `ring` overlap in what they point to, so we must make sure
// that `ring` is "derived-from" `deque`, or else even just creating ring
// from `self` already invalidates `deque`.
let deque = NonNull::from(&mut *self);

Drain {
deque: NonNull::from(&mut *self),
deque,
after_tail: drain_head,
after_head: head,
iter: Iter {
tail: drain_tail,
head: drain_head,
ring: unsafe { self.buffer_as_mut_slice() },
ring: unsafe { (&mut *deque.as_ptr()).buffer_as_mut_slice() },
},
}
}
Expand Down

0 comments on commit b0c4a35

Please sign in to comment.