Skip to content

Commit df59d7f

Browse files
committed
Review comments
1 parent ad8c784 commit df59d7f

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/shims/fs.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
881881
let this = self.eval_context_mut();
882882

883883
this.check_no_isolation("readdir64_r")?;
884+
this.assert_platform("linux", "readdir64_r");
884885

885886
let dirp = this.read_scalar(dirp_op)?.to_machine_usize(this)?;
886887

@@ -907,7 +908,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
907908

908909
let file_name = dir_entry.file_name();
909910
let (name_fits, _) = this.write_os_str_to_c_str(
910-
&file_name, name_place.ptr,
911+
&file_name,
912+
name_place.ptr,
911913
name_place.layout.size.bytes(),
912914
)?;
913915
if !name_fits {
@@ -966,10 +968,10 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
966968
let this = self.eval_context_mut();
967969

968970
this.check_no_isolation("readdir_r")?;
971+
this.assert_platform("macos", "readdir_r");
969972

970973
let dirp = this.read_scalar(dirp_op)?.to_machine_usize(this)?;
971974

972-
973975
let dir_iter = this.machine.dir_handler.streams.get_mut(&dirp).ok_or_else(|| {
974976
err_unsup_format!("The DIR pointer passed to readdir_r did not come from opendir")
975977
})?;
@@ -994,7 +996,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
994996

995997
let file_name = dir_entry.file_name();
996998
let (name_fits, file_name_len) = this.write_os_str_to_c_str(
997-
&file_name, name_place.ptr,
999+
&file_name,
1000+
name_place.ptr,
9981001
name_place.layout.size.bytes(),
9991002
)?;
10001003
if !name_fits {

0 commit comments

Comments
 (0)