status-im
/
evmc
mirror of https://github.com/status-im/evmc.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

rust: enforce EVMC rules on message and result buffers

This commit is contained in:
Alex Beregszaszi 2019-08-09 11:21:28 +02:00
parent 8634f0b18c
commit 52ea24f382
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bindings/rust/evmc-vm/src/lib.rs
View File

@ -351,7 +351,12 @@ impl From<ffi::evmc_result> for ExecutionResult {
let ret = ExecutionResult { let ret = ExecutionResult {
status_code: result.status_code, status_code: result.status_code,
gas_left: result.gas_left, gas_left: result.gas_left,
output: if !result.output_data.is_null() { output: if result.output_data.is_null() {
assert!(result.output_size == 0);
None
} else if result.output_size == 0 {
None
} else {
// Pre-allocate a vector. // Pre-allocate a vector.
let mut buf: Vec<u8> = Vec::with_capacity(result.output_size); let mut buf: Vec<u8> = Vec::with_capacity(result.output_size);
@ -363,8 +368,6 @@ impl From<ffi::evmc_result> for ExecutionResult {
} }
Some(buf) Some(buf)
} else {
None
}, },
// Consider it is always valid. // Consider it is always valid.
create_address: Some(result.create_address), create_address: Some(result.create_address),
@ -463,9 +466,9 @@ impl From<&ffi::evmc_message> for ExecutionMessage {
input: if message.input_data.is_null() { input: if message.input_data.is_null() {
assert!(message.input_size == 0); assert!(message.input_size == 0);
None None
} else if message.input_size == 0 {
None
} else { } else {
// TODO: what to do if input_size is 0?
// Pre-allocate a vector. // Pre-allocate a vector.
let mut buf: Vec<u8> = Vec::with_capacity(message.input_size); let mut buf: Vec<u8> = Vec::with_capacity(message.input_size);