Core/NetworkIO: Handle exceptions thrown from socket constructor when retrieving remote address

1 files changed, 10 insertions, 2 deletions

diff --git a/src/server/shared/Networking/AsyncAcceptor.h b/src/server/shared/Networking/AsyncAcceptor.h
index d056731bb79..64665c2b198 100644
--- a/src/server/shared/Networking/AsyncAcceptor.h
+++ b/src/server/shared/Networking/AsyncAcceptor.h
@@ -18,6 +18,7 @@
 #ifndef __ASYNCACCEPT_H_
 #define __ASYNCACCEPT_H_
 
+#include "Log.h"
 #include <boost/asio.hpp>
 
 using boost::asio::ip::tcp;
@@ -49,8 +50,15 @@ private:
         {
             if (!error)
             {
-                // this-> is required here to fix an segmentation fault in gcc 4.7.2 - reason is lambdas in a templated class
-                std::make_shared<T>(std::move(this->_socket))->Start();
+                try
+                {
+                    // this-> is required here to fix an segmentation fault in gcc 4.7.2 - reason is lambdas in a templated class
+                    std::make_shared<T>(std::move(this->_socket))->Start();
+                }
+                catch (boost::system::system_error const& err)
+                {
+                    TC_LOG_INFO("network", "Failed to retrieve client's remote address %s", err.what());
+                }
             }
 
             // lets slap some more this-> on this so we can fix this bug with gcc 4.7.2 throwing internals in yo face