Merge pull request #235 from ethereum/rust-result-fix

rust: Fix memory issues in ExecutionResult
ethereum · Apr 23, 2019 · 94ff7bb · 94ff7bb
2 parents 844a127 + 0d757c4
commit 94ff7bb
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/bindings/rust/evmc-vm/src/lib.rs b/bindings/rust/evmc-vm/src/lib.rs
@@ -115,16 +115,15 @@ impl Into<*const ffi::evmc_result> for ExecutionResult {
     }
 }
 
-/// Callback to pass across FFI, de-allocating the struct.
+/// Callback to pass across FFI, de-allocating the optional output_data.
 extern "C" fn release_result(result: *const ffi::evmc_result) {
     unsafe {
         let tmp = Box::from_raw(result as *mut ffi::evmc_result);
-        if tmp.output_data.is_null() {
+        if !tmp.output_data.is_null() {
             let buf_layout =
                 std::alloc::Layout::from_size_align(tmp.output_size, 1).expect("Bad layout");
             std::alloc::dealloc(tmp.output_data as *mut u8, buf_layout);
         }
-        Box::from_raw(result as *mut ffi::evmc_result);
     }
 }
 
@@ -192,6 +191,32 @@ mod tests {
                     == &[0xc0, 0xff, 0xee, 0x71, 0x75]
             );
             assert!((*f).create_address.bytes == [0u8; 20]);
+            if (*f).release.is_some() {
+                (*f).release.unwrap()(f);
+            }
+        }
+    }
+
+    #[test]
+    fn into_ffi_empty_data() {
+        let r = ExecutionResult::new(
+            ffi::evmc_status_code::EVMC_FAILURE,
+            420,
+            None,
+            ffi::evmc_address { bytes: [0u8; 20] },
+        );
+
+        let f: *const ffi::evmc_result = r.into();
+        assert!(!f.is_null());
+        unsafe {
+            assert!((*f).status_code == ffi::evmc_status_code::EVMC_FAILURE);
+            assert!((*f).gas_left == 420);
+            assert!((*f).output_data.is_null());
+            assert!((*f).output_size == 0);
+            assert!((*f).create_address.bytes == [0u8; 20]);
+            if (*f).release.is_some() {
+                (*f).release.unwrap()(f);
+            }
         }
     }
 }