user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Review comments

Browse source
This commit is contained in:
David Cook 2020-02-26 07:59:11 -06:00
parent ad8c784009
commit df59d7ff74
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/shims/fs.rs
View file

@ -881,6 +881,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let this = self.eval_context_mut();
this.check_no_isolation("readdir64_r")?;
this.assert_platform("linux", "readdir64_r");
let dirp = this.read_scalar(dirp_op)?.to_machine_usize(this)?;
@ -907,7 +908,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let file_name = dir_entry.file_name();
let (name_fits, _) = this.write_os_str_to_c_str(
&file_name, name_place.ptr,
&file_name,
name_place.ptr,
name_place.layout.size.bytes(),
)?;
if !name_fits {
@ -966,10 +968,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let this = self.eval_context_mut();
this.check_no_isolation("readdir_r")?;
this.assert_platform("macos", "readdir_r");
let dirp = this.read_scalar(dirp_op)?.to_machine_usize(this)?;
let dir_iter = this.machine.dir_handler.streams.get_mut(&dirp).ok_or_else(|| {
err_unsup_format!("The DIR pointer passed to readdir_r did not come from opendir")
})?;
@ -994,7 +996,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let file_name = dir_entry.file_name();
let (name_fits, file_name_len) = this.write_os_str_to_c_str(
&file_name, name_place.ptr,
&file_name,
name_place.ptr,
name_place.layout.size.bytes(),
)?;
if !name_fits {