Fix UB: Non-static callbacks are unsound

esp-rs · Nov 11, 2023 · d178c96 · d178c96
1 parent 5948ab3
commit d178c96
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/src/event_bus.rs b/src/event_bus.rs
@@ -51,9 +51,9 @@ pub trait EventBus<P>: ErrorType {
     where
         Self: 'a;
 
-    fn subscribe<'a, F>(&'a self, callback: F) -> Result<Self::Subscription<'a>, Self::Error>
+    fn subscribe<F>(&self, callback: F) -> Result<Self::Subscription<'_>, Self::Error>
     where
-        F: FnMut(&P) + Send + 'a;
+        F: FnMut(&P) + Send + 'static;
 }
 
 impl<'e, P, E> EventBus<P> for &'e E
@@ -62,9 +62,9 @@ where
 {
     type Subscription<'a> = E::Subscription<'a> where Self: 'a;
 
-    fn subscribe<'a, F>(&'a self, callback: F) -> Result<Self::Subscription<'a>, Self::Error>
+    fn subscribe<F>(&self, callback: F) -> Result<Self::Subscription<'_>, Self::Error>
     where
-        F: FnMut(&P) + Send + 'a,
+        F: FnMut(&P) + Send + 'static,
     {
         (**self).subscribe(callback)
     }
@@ -76,9 +76,9 @@ where
 {
     type Subscription<'a> = E::Subscription<'a> where Self: 'a;
 
-    fn subscribe<'a, F>(&'a self, callback: F) -> Result<Self::Subscription<'a>, Self::Error>
+    fn subscribe<F>(&self, callback: F) -> Result<Self::Subscription<'_>, Self::Error>
     where
-        F: FnMut(&P) + Send + 'a,
+        F: FnMut(&P) + Send + 'static,
     {
         (**self).subscribe(callback)
     }

diff --git a/src/ping.rs b/src/ping.rs
@@ -63,7 +63,7 @@ pub trait Ping {
 
     fn ping(&mut self, ip: ipv4::Ipv4Addr, conf: &Configuration) -> Result<Summary, Self::Error>;
 
-    fn ping_details<F: FnMut(&Summary, &Reply) + Send>(
+    fn ping_details<F: FnMut(&Summary, &Reply) + Send + 'static>(
         &mut self,
         ip: ipv4::Ipv4Addr,
         conf: &Configuration,
@@ -81,7 +81,7 @@ where
         (*self).ping(ip, conf)
     }
 
-    fn ping_details<F: FnMut(&Summary, &Reply) + Send>(
+    fn ping_details<F: FnMut(&Summary, &Reply) + Send + 'static>(
         &mut self,
         ip: ipv4::Ipv4Addr,
         conf: &Configuration,
@@ -107,7 +107,7 @@ pub mod asynch {
             conf: &Configuration,
         ) -> Result<Summary, Self::Error>;
 
-        async fn ping_details<F: FnMut(&Summary, &Reply) + Send>(
+        async fn ping_details<F: FnMut(&Summary, &Reply) + Send + 'static>(
             &mut self,
             ip: ipv4::Ipv4Addr,
             conf: &Configuration,
@@ -129,7 +129,7 @@ pub mod asynch {
             (*self).ping(ip, conf).await
         }
 
-        async fn ping_details<F: FnMut(&Summary, &Reply) + Send>(
+        async fn ping_details<F: FnMut(&Summary, &Reply) + Send + 'static>(
             &mut self,
             ip: ipv4::Ipv4Addr,
             conf: &Configuration,

diff --git a/src/timer.rs b/src/timer.rs
@@ -72,9 +72,9 @@ pub trait TimerService: ErrorType {
     where
         Self: 'a;
 
-    fn timer<'a, F>(&'a self, callback: F) -> Result<Self::Timer<'a>, Self::Error>
+    fn timer<F>(&self, callback: F) -> Result<Self::Timer<'_>, Self::Error>
     where
-        F: FnMut() + Send + 'a;
+        F: FnMut() + Send + 'static;
 }
 
 impl<S> TimerService for &S
@@ -83,9 +83,9 @@ where
 {
     type Timer<'a> = S::Timer<'a> where Self: 'a;
 
-    fn timer<'a, F>(&'a self, callback: F) -> Result<Self::Timer<'a>, Self::Error>
+    fn timer<F>(&self, callback: F) -> Result<Self::Timer<'_>, Self::Error>
     where
-        F: FnMut() + Send + 'a,
+        F: FnMut() + Send + 'static,
     {
         (*self).timer(callback)
     }
@@ -97,9 +97,9 @@ where
 {
     type Timer<'a> = S::Timer<'a> where Self: 'a;
 
-    fn timer<'a, F>(&'a self, callback: F) -> Result<Self::Timer<'a>, Self::Error>
+    fn timer<F>(&self, callback: F) -> Result<Self::Timer<'_>, Self::Error>
     where
-        F: FnMut() + Send + 'a,
+        F: FnMut() + Send + 'static,
     {
         (**self).timer(callback)
     }

diff --git a/src/utils/asyncify/event_bus.rs b/src/utils/asyncify/event_bus.rs
@@ -187,7 +187,7 @@ where
     where
         P: Clone + Send + 'static,
         E: crate::event_bus::EventBus<P>,
-        for<'a> E::Subscription<'a>: Send,
+        for<'a> E::Subscription<'a>: Send + 'static,
     {
         let state = Arc::new((
             Mutex::new(SubscriptionState {