Merge pull request #111 from magnusuMET/bugfix/panic_safety

check all callbacks for panic safety

Author: aldanor

src/error.rs

@@ -2,6 +2,7 @@ use std::cell::RefCell;
 use std::error::Error as StdError;
 use std::fmt;
 use std::ops::Index;
+use std::panic;
 use std::ptr;
 
 use lazy_static::lazy_static;
@@ -65,7 +66,7 @@ lazy_static! {
 }
 
 extern "C" fn default_error_handler(estack: hid_t, _cdata: *mut c_void) -> herr_t {
-    unsafe { H5Eprint2(estack, ptr::null_mut()) }
+    panic::catch_unwind(|| unsafe { H5Eprint2(estack, ptr::null_mut()) }).unwrap_or(-1)
 }
 
 impl SilenceErrors {
@@ -134,7 +135,7 @@ impl ErrorStack {
         extern "C" fn callback(
             _: c_uint, err_desc: *const H5E_error2_t, data: *mut c_void,
         ) -> herr_t {
-            unsafe {
+            panic::catch_unwind(|| unsafe {
                 let data = &mut *(data as *mut CallbackData);
                 if data.err.is_some() {
                     return 0;
@@ -154,7 +155,8 @@ impl ErrorStack {
                     }
                 }
                 0
-            }
+            })
+            .unwrap_or(-1)
         }
 
         let mut data = CallbackData { stack: Self::new(), err: None };

src/hl/group.rs

@@ -1,5 +1,6 @@
 use std::fmt::{self, Debug};
 use std::ops::Deref;
+use std::panic;
 
 use hdf5_sys::{
     h5::{hsize_t, H5_index_t, H5_iter_order_t},
@@ -177,11 +178,14 @@ impl Group {
         extern "C" fn members_callback(
             _id: hid_t, name: *const c_char, _info: *const H5L_info_t, op_data: *mut c_void,
         ) -> herr_t {
-            let other_data: &mut Vec<String> = unsafe { &mut *(op_data as *mut Vec<String>) };
+            panic::catch_unwind(|| {
+                let other_data: &mut Vec<String> = unsafe { &mut *(op_data as *mut Vec<String>) };
 
-            other_data.push(string_from_cstr(name));
+                other_data.push(string_from_cstr(name));
 
-            0 // Continue iteration
+                0 // Continue iteration
+            })
+            .unwrap_or(-1)
         }
 
         let callback_fn: H5L_iterate_t = Some(members_callback);

src/hl/plist.rs

@@ -169,12 +169,15 @@ impl PropertyList {
     /// Iterates over properties in the property list, returning their names.
     pub fn properties(&self) -> Vec<String> {
         extern "C" fn callback(_: hid_t, name: *const c_char, data: *mut c_void) -> herr_t {
-            let data = unsafe { &mut *(data as *mut Vec<String>) };
-            let name = string_from_cstr(name);
-            if !name.is_empty() {
-                data.push(name);
-            }
-            0
+            panic::catch_unwind(|| {
+                let data = unsafe { &mut *(data as *mut Vec<String>) };
+                let name = string_from_cstr(name);
+                if !name.is_empty() {
+                    data.push(name);
+                }
+                0
+            })
+            .unwrap_or(-1)
         }
 
         let mut data = Vec::new();