mirror
/
r2r
mirror of https://github.com/sequenceplanner/r2r.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid memory leak in loaned-message return path

This commit is contained in:
Tobias Stark 2024-05-31 12:13:36 +00:00 committed by Martin Dahl
parent 21948154fe
commit 05d2c194d0
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
r2r/src/subscribers.rs
View File

@ -101,23 +101,27 @@ where
let handle_ptr = Box::into_raw(handle_box); let handle_ptr = Box::into_raw(handle_box);
let ret = let ret =
rcl_return_loaned_message_from_subscription(handle_ptr, msg as *mut c_void); rcl_return_loaned_message_from_subscription(handle_ptr, msg as *mut c_void);
if ret != RCL_RET_OK as i32 { if ret == RCL_RET_OK as i32 {
drop(Box::from_raw(handle_ptr));
} else {
let topic_str = rcl_subscription_get_topic_name(handle_ptr);
let topic = CStr::from_ptr(topic_str);
drop(Box::from_raw(handle_ptr));
let err_str = rcutils_get_error_string(); let err_str = rcutils_get_error_string();
let err_str_ptr = &(err_str.str_) as *const std::os::raw::c_char; let err_str_ptr = &(err_str.str_) as *const std::os::raw::c_char;
let error_msg = CStr::from_ptr(err_str_ptr); let error_msg = CStr::from_ptr(err_str_ptr);
let topic_str = rcl_subscription_get_topic_name(handle_ptr); // Returning a loan shouldn't fail unless one of the handles or pointers
let topic = CStr::from_ptr(topic_str); // is invalid, both of which indicate a severe bug. Panicking is therefore
// more appropriate than leaking the loaned message.
crate::log_error!( panic!(
"r2r",
"rcl_return_loaned_message_from_subscription() \ "rcl_return_loaned_message_from_subscription() \
failed for subscription on topic {}: {}", failed for subscription on topic {}: {}",
topic.to_str().expect("to_str() call failed"), topic.to_str().expect("to_str() call failed"),
error_msg.to_str().expect("to_str() call failed") error_msg.to_str().expect("to_str() call failed")
); );
} }
// drop(Box::from_raw(handle_ptr));
}); });
WrappedNativeMsg::<T>::from_loaned(loaned_msg as *mut T::CStruct, deallocator) WrappedNativeMsg::<T>::from_loaned(loaned_msg as *mut T::CStruct, deallocator)
} else { } else {