mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gen_random: use check_ptr_access

Browse Source
This commit is contained in:
Ralf Jung 2019-06-30 23:32:25 +02:00
parent 8093a59ffb
commit 3ca934f07d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/helpers.rs
View File

@ -1,6 +1,6 @@
use std::mem;
use rustc::ty::{self, layout::{self, Size}};
use rustc::ty::{self, layout::{self, Size, Align}};
use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX};
use rand::RngCore;
@ -71,14 +71,14 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
fn gen_random(
&mut self,
len: usize,
dest: Scalar<Tag>,
ptr: Scalar<Tag>,
) -> InterpResult<'tcx> {
if len == 0 {
// Nothing to do
return Ok(());
}
let this = self.eval_context_mut();
let ptr = dest.to_ptr()?;
let ptr = match this.memory().check_ptr_access(ptr, Size::from_bytes(len as u64), Align::from_bytes(1).unwrap())? {
Some(ptr) => ptr,
None => return Ok(()), // zero-sized access
};
let data = match &mut this.memory_mut().extra.rng {
Some(rng) => {