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

rust: introduce from_buf_raw helper

This commit is contained in:
Alex Beregszaszi 2019-06-27 13:19:46 +01:00
parent 7aa609a6ae
commit 0151bc5d37
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -357,17 +357,7 @@ impl From<ffi::evmc_result> for ExecutionResult {
} else if result.output_size == 0 {
None
} else {
// Pre-allocate a vector.
let mut buf: Vec<u8> = Vec::with_capacity(result.output_size);
unsafe {
// Set the len of the vec manually.
buf.set_len(result.output_size);
// Copy from the C struct's buffer to the vec's buffer.
std::ptr::copy(result.output_data, buf.as_mut_ptr(), result.output_size);
}
Some(buf)
Some(from_buf_raw::<u8>(result.output_data, result.output_size))
},
// Consider it is always valid.
create_address: Some(result.create_address),
@ -469,17 +459,7 @@ impl From<&ffi::evmc_message> for ExecutionMessage {
} else if message.input_size == 0 {
None
} else {
// Pre-allocate a vector.
let mut buf: Vec<u8> = Vec::with_capacity(message.input_size);
unsafe {
// Set the len of the vec manually.
buf.set_len(message.input_size);
// Copy from the C struct's buffer to the vec's buffer.
std::ptr::copy(message.input_data, buf.as_mut_ptr(), message.input_size);
}
Some(buf)
Some(from_buf_raw::<u8>(message.input_data, message.input_size))
},
value: message.value,
create2_salt: message.create2_salt,
@ -487,6 +467,18 @@ impl From<&ffi::evmc_message> for ExecutionMessage {
}
}
fn from_buf_raw<T>(ptr: *const T, size: usize) -> Vec<T> {
// Pre-allocate a vector.
let mut buf = Vec::with_capacity(size);
unsafe {
// Set the len of the vec manually.
buf.set_len(size);
// Copy from the C buffer to the vec's buffer.
std::ptr::copy(ptr, buf.as_mut_ptr(), size);
}
buf
}
#[cfg(test)]
mod tests {
use super::*;