Skip to content

Commit

Permalink
fix unaligned and illegal-provenance reads
Browse files Browse the repository at this point in the history
  • Loading branch information
RalfJung committed Apr 19, 2019
1 parent 852988b commit 8303309
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion rand_core/src/block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ where <R as BlockRngCore>::Results: AsRef<[u32]> + AsMut<[u32]>
let read_u64 = |results: &[u32], index| {
if cfg!(any(target_arch = "x86", target_arch = "x86_64")) {
// requires little-endian CPU supporting unaligned reads:
unsafe { *(&results[index] as *const u32 as *const u64) }
let ptr: *const u64 = &results[index..index+1] as *const [u32] as *const u32 as *const u64;
unsafe { std::ptr::read_unaligned(ptr) }
} else {
let x = u64::from(results[index]);
let y = u64::from(results[index + 1]);
Expand Down

0 comments on commit 8303309

Please sign in to comment.