Ticket #11823: boost_asio_epoll_accept_exception_safety.patch

boost_1_57_0/boost/asio/detail/impl/epoll_reactor.ipp

@@ -569 +569 @@
 struct epoll_reactor::perform_io_cleanup_on_block_exit
 {
   explicit perform_io_cleanup_on_block_exit(epoll_reactor* r)
-    : reactor_(r), first_op_(0)
+    : reactor_(r), first_op_(0), compensate_work_finished(false)
   {
   }
 
@@ -586 +586 @@
       // the fact that the task_io_service will call work_finished() once we
       // return.
     }
-    else
+    else if( compensate_work_finished )
     {
       // No user-initiated operations have completed, so we need to compensate
       // for the work_finished() call that the task_io_service will make once
@@ -598 +598 @@
   epoll_reactor* reactor_;
   op_queue<operation> ops_;
   operation* first_op_;
+  bool compensate_work_finished;
 };
 
 epoll_reactor::descriptor_state::descriptor_state()
@@ -635 +636 @@
   // be posted for later by the io_cleanup object's destructor.
   io_cleanup.first_op_ = io_cleanup.ops_.front();
   io_cleanup.ops_.pop();
+  io_cleanup.compensate_work_finished = true;
   return io_cleanup.first_op_;
 }
 

boost_1_57_0/boost/asio/detail/task_io_service_operation.hpp

@@ -40 +40 @@
 
   void destroy()
   {
-    func_(0, this, boost::system::error_code(), 0);
+    try
+    {
+      func_(0, this, boost::system::error_code(), 0);
+    }
+    catch(std::exception&)
+    {
+    }
   }
 
 protected: