Fix unsoundness in PdInfo::as_struct()

goToMain · Sep 28, 2024 · 7062a36 · 7062a36
1 parent 246a910
commit 7062a36
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/libosdp/src/pdinfo.rs b/libosdp/src/pdinfo.rs
@@ -250,12 +250,11 @@ impl PdInfoBuilder {
 impl PdInfo {
     /// Get a C-repr struct for PdInfo that LibOSDP can operate on.
     pub fn as_struct(&mut self) -> libosdp_sys::osdp_pd_info_t {
-        let scbk;
-        if let Some(key) = self.scbk.as_mut() {
-            scbk = key.as_mut_ptr();
+        let scbk = if let Some(key) = self.scbk {
+            Box::into_raw(Box::new(key)) as *mut _
         } else {
-            scbk = std::ptr::null_mut::<u8>();
-        }
+            std::ptr::null_mut::<u8>()
+        };
         libosdp_sys::osdp_pd_info_t {
             name: self.name.as_ptr(),
             baud_rate: self.baud_rate,