Fix memory corruption in logging trampoline

mbiggio · May 20, 2024 · f055de7 · f055de7
1 parent d59bbb0
commit f055de7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/cplex-rs/src/environment.rs b/cplex-rs/src/environment.rs
@@ -117,12 +117,12 @@ impl Environment {
         }
 
         let mut new_closure = Box::new(closure);
-        let new_trampoline = get_trampoline(&new_closure);
+        let new_trampoline = get_trampoline::<F>();
         macros::cpx_env_result!(unsafe {
             CPXaddfuncdest(
                 self.inner,
                 channel,
-                &mut *new_closure as *mut _ as *mut c_void,
+                &mut *new_closure as *mut F as *mut c_void,
                 new_trampoline,
             )
         })?;

diff --git a/cplex-rs/src/logging.rs b/cplex-rs/src/logging.rs
@@ -29,10 +29,7 @@ impl StreamType {
     }
 }
 
-pub(crate) fn get_trampoline<F>(_closure: &F) -> LoggingCallback
-where
-    F: Fn(&str),
-{
+pub(crate) fn get_trampoline<F: Fn(&str)>() -> LoggingCallback {
     Some(trampoline::<F>)
 }