fix(rust): catch panics in extern "C" functions

build-trust · Oct 30, 2021 · c623001 · c623001
1 parent 918b9de
commit c623001
Show file tree

Hide file tree

Showing 3 changed files with 292 additions and 249 deletions.
diff --git a/implementations/rust/ockam/ockam_ffi/src/error.rs b/implementations/rust/ockam/ockam_ffi/src/error.rs
@@ -74,6 +74,9 @@ pub enum FfiError {
 
     /// Ownership error.
     OwnershipError,
+
+    /// Caught a panic (which would be UB if we let it unwind across the FFI).
+    UnexpectedPanic,
 }
 
 impl FfiError {

diff --git a/implementations/rust/ockam/ockam_ffi/src/macros.rs b/implementations/rust/ockam/ockam_ffi/src/macros.rs
@@ -3,12 +3,12 @@
 macro_rules! check_buffer {
     ($buffer:expr) => {
         if $buffer.is_null() {
-            return FfiError::InvalidParam.into();
+            return Err(FfiError::InvalidParam.into());
         }
     };
     ($buffer:expr, $length:expr) => {
         if $buffer.is_null() || $length == 0 {
-            return FfiError::InvalidParam.into();
+            return Err(FfiError::InvalidParam.into());
         }
     };
 }