Previous fix introduced a leak, use a better approach.

boostorg · Aug 12, 2017 · b002097 · b002097
1 parent c8d628a
commit b002097
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 10 deletions.
diff --git a/include/boost/asio/detail/impl/epoll_reactor.ipp b/include/boost/asio/detail/impl/epoll_reactor.ipp
@@ -360,6 +360,15 @@ void epoll_reactor::deregister_descriptor(socket_type descriptor,
     descriptor_lock.unlock();
 
     io_service_.post_deferred_completions(ops);
+
+    // Leave descriptor_data set so that it will be freed by the subsequent
+    // call to cleanup_descriptor_data.
+  }
+  else
+  {
+    // We are shutting down, so prevent cleanup_descriptor_data from freeing
+    // the descriptor_data object and let the destructor free it instead.
+    descriptor_data = 0;
   }
 }
 
@@ -384,6 +393,15 @@ void epoll_reactor::deregister_internal_descriptor(socket_type descriptor,
     descriptor_data->shutdown_ = true;
 
     descriptor_lock.unlock();
+
+    // Leave descriptor_data set so that it will be freed by the subsequent
+    // call to cleanup_descriptor_data.
+  }
+  else
+  {
+    // We are shutting down, so prevent cleanup_descriptor_data from freeing
+    // the descriptor_data object and let the destructor free it instead.
+    descriptor_data = 0;
   }
 }
 
@@ -392,11 +410,8 @@ void epoll_reactor::cleanup_descriptor_data(
 {
   if (descriptor_data)
   {
-    if (!descriptor_data->shutdown_)
-    {
-      free_descriptor_state(descriptor_data);
-      descriptor_data = 0;
-    }
+    free_descriptor_state(descriptor_data);
+    descriptor_data = 0;
   }
 }
 

diff --git a/include/boost/asio/detail/impl/kqueue_reactor.ipp b/include/boost/asio/detail/impl/kqueue_reactor.ipp
@@ -313,6 +313,15 @@ void kqueue_reactor::deregister_descriptor(socket_type descriptor,
     descriptor_lock.unlock();
 
     io_service_.post_deferred_completions(ops);
+
+    // Leave descriptor_data set so that it will be freed by the subsequent
+    // call to cleanup_descriptor_data.
+  }
+  else
+  {
+    // We are shutting down, so prevent cleanup_descriptor_data from freeing
+    // the descriptor_data object and let the destructor free it instead.
+    descriptor_data = 0;
   }
 }
 
@@ -341,6 +350,15 @@ void kqueue_reactor::deregister_internal_descriptor(socket_type descriptor,
     descriptor_data->shutdown_ = true;
 
     descriptor_lock.unlock();
+
+    // Leave descriptor_data set so that it will be freed by the subsequent
+    // call to cleanup_descriptor_data.
+  }
+  else
+  {
+    // We are shutting down, so prevent cleanup_descriptor_data from freeing
+    // the descriptor_data object and let the destructor free it instead.
+    descriptor_data = 0;
   }
 }
 
@@ -349,11 +367,8 @@ void kqueue_reactor::cleanup_descriptor_data(
 {
   if (descriptor_data)
   {
-    if (!descriptor_data->shutdown_)
-    {
-      free_descriptor_state(descriptor_data);
-      descriptor_data = 0;
-    }
+    free_descriptor_state(descriptor_data);
+    descriptor_data = 0;
   }
 }