bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #78602 - RalfJung:raw-ptr-aliasing-issues, r=m-ou-se

Browse source 
fix various aliasing issues in the standard library

This fixes various cases where the standard library either used raw pointers after they were already invalidated by using the original reference again, or created raw pointers for one element of a slice and used it to access neighboring elements.
This commit is contained in:
Mara Bos 2020-11-01 11:53:36 +01:00 • committed by GitHub
commit 8ed31d2782
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
library/alloc/src/collections/binary_heap.rs
View file

@ -1036,8 +1036,9 @@ impl<'a, T> Hole<'a, T> {
debug_assert!(index != self.pos);
debug_assert!(index < self.data.len());
unsafe {
let index_ptr: *const _ = self.data.get_unchecked(index);
let hole_ptr = self.data.get_unchecked_mut(self.pos);
let ptr = self.data.as_mut_ptr();
let index_ptr: *const _ = ptr.add(index);
let hole_ptr = ptr.add(self.pos);
ptr::copy_nonoverlapping(index_ptr, hole_ptr, 1);
}
self.pos = index;