[Rust] Fix leaking the context of a data notification handle on drop

Author: emesare

rust/src/data_notification.rs

@@ -472,11 +472,9 @@ impl<T: CustomDataNotification> DataNotificationHandle<'_, T> {
         Box::from_raw(self.handle.context as *mut T)
     }
 
-    pub fn unregister(self) -> T {
-        // NOTE: Don't drop the ctxt, return it
-        let mut slf = core::mem::ManuallyDrop::new(self);
-        unsafe { slf.unregister_bv() };
-        unsafe { *slf.extract_context() }
+    pub fn unregister(mut self) -> T {
+        unsafe { self.unregister_bv() };
+        unsafe { *self.extract_context() }
     }
 }
 
@@ -500,19 +498,17 @@ where
 }
 
 impl<T: CustomDataNotification> PersistedDataNotificationHandle<'_, T> {
-    unsafe fn unregister_bv(&mut self, view: &BinaryView) {
+    unsafe fn unregister_for_view(&mut self, view: &BinaryView) {
         BNUnregisterDataNotification(view.handle, self.handle.as_mut())
     }
 
     unsafe fn extract_context(&mut self) -> Box<T> {
         Box::from_raw(self.handle.context as *mut T)
     }
 
-    pub fn unregister(self, view: &BinaryView) -> T {
-        // NOTE: Don't drop the ctxt, return it
-        let mut slf = core::mem::ManuallyDrop::new(self);
-        unsafe { slf.unregister_bv(view) };
-        unsafe { *slf.extract_context() }
+    pub fn unregister(mut self, view: &BinaryView) -> T {
+        unsafe { self.unregister_for_view(view) };
+        unsafe { *self.extract_context() }
     }
 }