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

Fix CALLDATACOPY (and bonus CODECOPY, too!).

Browse Source 
Fixes #269
Fixes #270
Also fix evm debug feature.
This commit is contained in:
Gav Wood
2016-01-31 22:47:24 +01:00
parent 122e1ff9ae
commit 0254b36dc1
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ethcore/src/evm/interpreter.rs
View File

@@ -791,23 +791,30 @@ impl Interpreter {
Ok(InstructionResult::Ok)
}
fn copy_data_to_memory(&self,
mem: &mut Memory,
stack: &mut Stack<U256>,
data: &[u8]) {
let offset = stack.pop_back();
let index = stack.pop_back();
fn copy_data_to_memory(&self, mem: &mut Memory, stack: &mut Stack<U256>, data: &[u8]) {
let dest_offset = stack.pop_back();
let source_offset = stack.pop_back();
let size = stack.pop_back();
let data_size = data.len();
let source_size = U256::from(data.len());
if index < U256::from(data_size) {
let u_index = index.low_u64() as usize;
let bound_size = match size + index > U256::from(data_size) {
true => data_size,
false => size.low_u64() as usize + u_index
};
let output_end = match source_offset > source_size || size > source_size || source_offset + size > source_size {
true => {
let zero_slice = if source_offset > source_size {
mem.writeable_slice(dest_offset, size)
} else {
mem.writeable_slice(dest_offset + source_size - source_offset, source_offset + size - source_size)
};
for i in zero_slice.iter_mut() {
*i = 0;
}
data.len()
},
false => (size.low_u64() + source_offset.low_u64()) as usize
};
mem.write_slice(offset, &data[u_index..bound_size]);
if source_offset < source_size {
let output_begin = source_offset.low_u64() as usize;
mem.write_slice(dest_offset, &data[output_begin..output_end]);
}
}