Manually drop osdp_pd_info_t to prevent leaks

Author: Sympatron

libosdp/src/cp.rs

@@ -57,6 +57,9 @@ where
 
 fn cp_setup(info: Vec<libosdp_sys::osdp_pd_info_t>) -> Result<*mut c_void> {
     let ctx = unsafe { libosdp_sys::osdp_cp_setup(info.len() as i32, info.as_ptr()) };
+    for pd in info.into_iter() {
+        crate::drop_osdp_pd_info(pd);
+    }
     if ctx.is_null() {
         Err(OsdpError::Setup)
     } else {

libosdp/src/pd.rs

@@ -58,7 +58,9 @@ where
 }
 
 fn pd_setup(mut info: PdInfo) -> Result<*mut c_void> {
-    let ctx = unsafe { libosdp_sys::osdp_pd_setup(&info.as_struct()) };
+    let info_struct = info.as_struct();
+    let ctx = unsafe { libosdp_sys::osdp_pd_setup(&info_struct) };
+    crate::drop_osdp_pd_info(info_struct);
     if ctx.is_null() {
         Err(OsdpError::Setup)
     } else {

libosdp/src/pdinfo.rs

@@ -279,3 +279,27 @@ impl PdInfo {
         }
     }
 }
+
+pub(crate) fn drop_osdp_pd_info(info: libosdp_sys::osdp_pd_info_t) {
+    unsafe {
+        // The name is not copied by LibOSDP, so we cannot drop it here
+        // if !info.name.is_null() {
+        //     drop(CString::from_raw(info.name as *mut _));
+        // }
+        if !info.cap.is_null() {
+            let mut cap = info.cap as *mut libosdp_sys::osdp_pd_cap;
+            while (*cap).function_code != -1i8 as u8 {
+                cap = cap.add(1);
+            }
+            let len = (cap.offset_from(info.cap) + 1) as usize;
+            drop(Vec::from_raw_parts(
+                info.cap as *mut libosdp_sys::osdp_pd_cap,
+                len,
+                len,
+            ));
+        }
+        if !info.scbk.is_null() {
+            drop(Box::from_raw(info.scbk as *mut [u8; 16]));
+        }
+    }
+}