v2.5.7 stable (#11006)

* [trace] check mem diff within range (#11002) * Update version (v2.5.7-stable)
openethereum · Aug 29, 2019 · 6bd7db9 · 6bd7db9
1 parent ff398fe
commit 6bd7db9
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.5.6"
+version = "2.5.7"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 

diff --git a/ethcore/src/trace/executive_tracer.rs b/ethcore/src/trace/executive_tracer.rs
@@ -18,6 +18,7 @@
 
 use ethereum_types::{U256, Address};
 use vm::{Error as VmError, ActionParams};
+use log::{debug, warn};
 use trace::trace::{Call, Create, Action, Res, CreateResult, CallResult, VMTrace, VMOperation, VMExecutedOperation, MemoryDiff, StorageDiff, Suicide, Reward, RewardType};
 use trace::{Tracer, VMTracer, FlatTrace};
 
@@ -245,7 +246,19 @@ impl VMTracer for ExecutiveVMTracer {
 	}
 
 	fn trace_executed(&mut self, gas_used: U256, stack_push: &[U256], mem: &[u8]) {
-		let mem_diff = self.last_mem_written.take().map(|(o, s)| (o, &(mem[o..o+s])));
+		let mem_diff = self.last_mem_written.take().map(|(o, s)| {
+			if o + s > mem.len() {
+				warn!(
+					target: "trace",
+					"Last mem written is out of bounds {} (mem is {})",
+					o + s,
+					mem.len(),
+				);
+				(o, &[][..])
+			} else {
+				(o, &(mem[o..o+s]))
+			}
+		});
 		let store_diff = self.last_store_written.take();
 		Self::with_trace_in_depth(&mut self.data, self.depth, move |trace| {
 			let ex = VMExecutedOperation {

diff --git a/util/version/Cargo.toml b/util/version/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for Parity Ethereum version string (via env CARGO_PKG_VERSION)
-version = "2.5.6"
+version = "2.5.7"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"