grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix memory tracing.

Browse Source
This commit is contained in:
Tomasz Drwięga 2017-08-26 21:53:41 +02:00
parent b6024adf85
commit dd3b6d49ee
No known key found for this signature in database
GPG Key ID: D066F497E62CAF66
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/evm/src/interpreter/memory.rs
View File

@ -44,7 +44,7 @@ pub trait Memory {
} }
/// Checks whether offset and size is valid memory range /// Checks whether offset and size is valid memory range
fn is_valid_range(off: usize, size: usize) -> bool { pub fn is_valid_range(off: usize, size: usize) -> bool {
// When size is zero we haven't actually expanded the memory // When size is zero we haven't actually expanded the memory
let overflow = off.overflowing_add(size).1; let overflow = off.overflowing_add(size).1;
size > 0 && !overflow size > 0 && !overflow

27
ethcore/evm/src/interpreter/mod.rs
View File

@ -168,7 +168,12 @@ impl<Cost: CostType> vm::Vm for Interpreter<Cost> {
} }
if do_trace { if do_trace {
ext.trace_executed(gasometer.current_gas.as_u256(), stack.peek_top(info.ret), mem_written.map(|(o, s)| (o, &(self.mem[o..(o + s)]))), store_written); ext.trace_executed(
gasometer.current_gas.as_u256(),
stack.peek_top(info.ret),
mem_written.map(|(o, s)| (o, &(self.mem[o..o+s]))),
store_written,
);
} }
// Advance // Advance
@ -252,14 +257,20 @@ impl<Cost: CostType> Interpreter<Cost> {
instruction: Instruction, instruction: Instruction,
stack: &Stack<U256> stack: &Stack<U256>
) -> Option<(usize, usize)> { ) -> Option<(usize, usize)> {
match instruction { let read = |pos| stack.peek(pos).low_u64() as usize;
instructions::MSTORE | instructions::MLOAD => Some((stack.peek(0).low_u64() as usize, 32)), let written = match instruction {
instructions::MSTORE8 => Some((stack.peek(0).low_u64() as usize, 1)), instructions::MSTORE | instructions::MLOAD => Some((read(0), 32)),
instructions::CALLDATACOPY | instructions::CODECOPY | instructions::RETURNDATACOPY => Some((stack.peek(0).low_u64() as usize, stack.peek(2).low_u64() as usize)), instructions::MSTORE8 => Some((read(0), 1)),
instructions::EXTCODECOPY => Some((stack.peek(1).low_u64() as usize, stack.peek(3).low_u64() as usize)), instructions::CALLDATACOPY | instructions::CODECOPY | instructions::RETURNDATACOPY => Some((read(0), read(2))),
instructions::CALL | instructions::CALLCODE => Some((stack.peek(5).low_u64() as usize, stack.peek(6).low_u64() as usize)), instructions::EXTCODECOPY => Some((read(1), read(3))),
instructions::DELEGATECALL => Some((stack.peek(4).low_u64() as usize, stack.peek(5).low_u64() as usize)), instructions::CALL | instructions::CALLCODE => Some((read(5), read(6))),
instructions::DELEGATECALL | instructions::STATICCALL => Some((read(4), read(5))),
_ => None, _ => None,
};
match written {
Some((offset, size)) if !memory::is_valid_range(offset, size) => None,
written => written,
} }
} }