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

to_u64 and to_bytes are horribly easy to use wrongly.

Browse source
This commit is contained in:
Oliver Schneider 2018-05-30 17:43:54 +02:00
parent ea2c8bfb04
commit 066a284557
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/fn_call.rs
View file

@ -316,7 +316,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
"memrchr" => {
let ptr = self.into_ptr(args[0].value)?;
let val = self.value_to_scalar(args[1])?.to_u64()? as u8;
let val = self.value_to_scalar(args[1])?.to_bytes()? as u8;
let num = self.value_to_scalar(args[2])?.to_u64()?;
if let Some(idx) = self.memory.read_bytes(ptr, Size::from_bytes(num))?.iter().rev().position(
|&c| c == val,
@ -331,7 +331,7 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
"memchr" => {
let ptr = self.into_ptr(args[0].value)?;
let val = self.value_to_scalar(args[1])?.to_u64()? as u8;
let val = self.value_to_scalar(args[1])?.to_bytes()? as u8;
let num = self.value_to_scalar(args[2])?.to_u64()?;
if let Some(idx) = self.memory.read_bytes(ptr, Size::from_bytes(num))?.iter().position(
|&c| c == val,
@ -414,9 +414,9 @@ impl<'a, 'mir, 'tcx: 'mir + 'a> EvalContextExt<'tcx> for EvalContext<'a, 'mir, '
}
"write" => {
let fd = self.value_to_scalar(args[0])?.to_u64()?;
let fd = self.value_to_scalar(args[0])?.to_bytes()?;
let buf = self.into_ptr(args[1].value)?;
let n = self.value_to_scalar(args[2])?.to_u64()?;
let n = self.value_to_scalar(args[2])?.to_bytes()? as u64;
trace!("Called write({:?}, {:?}, {:?})", fd, buf, n);
let result = if fd == 1 || fd == 2 {
// stdout/stderr

3
src/lib.rs
View file

@ -64,6 +64,9 @@ pub trait ScalarExt {
fn from_f64(f: f64) -> Self;
fn to_u64(self) -> EvalResult<'static, u64>;
fn is_null(self) -> EvalResult<'static, bool>;
/// HACK: this function just extracts all bits if `defined != 0`
/// Mainly used for args of C-functions and we should totally correctly fetch the size
/// of their arguments
fn to_bytes(self) -> EvalResult<'static, u128>;
}