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

Read into buffer of fixed size for reads to STDIN

Browse source 
Also:
- Check isolation is disabled.
- Add FIXMEs to set error numbers in `read` and `write`.
This commit is contained in:
Samrat Man Singh 2020-07-12 20:27:19 +05:30
parent 2602e951c0
commit 74ff4f805a
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/shims/posix/foreign_items.rs
View file

@ -69,14 +69,21 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
let result = if fd == 0 {
use std::io::{self, Read};
let mut buffer = String::new();
let res = io::stdin().read_to_string(&mut buffer);
this.check_no_isolation("read")?;
let mut buffer = vec![0; count as usize];
let res = io::stdin()
.read(&mut buffer)
// `Stdin::read` never returns a value larger
// than `count`, so this cannot fail.
.map(|c| i64::try_from(c).unwrap());
match res {
Ok(bytes) => {
this.memory.write_bytes(buf, buffer.bytes())?;
this.memory.write_bytes(buf, buffer)?;
i64::try_from(bytes).unwrap()
},
// FIXME: set errno to appropriate value
Err(_) => -1,
}
} else if fd == 1 || fd == 2 {
@ -114,6 +121,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
};
match res {
Ok(n) => i64::try_from(n).unwrap(),
// FIXME: set errno to appropriate value
Err(_) => -1,
}
} else {