From 1119558b9e4e525af05875867afa864df5e808ee Mon Sep 17 00:00:00 2001
From: Nayd <dnpd.dd@gmail.com>
Date: Sun, 16 Nov 2014 20:08:28 +0000
Subject: [PATCH] Core/Networking: Catch possible boost exception in
 StartNetwork

Closes #13557

(cherry picked from commit 3eb120ab507aa65e452d21a63ff500254129c262)
---
 src/server/shared/Networking/SocketMgr.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/server/shared/Networking/SocketMgr.h b/src/server/shared/Networking/SocketMgr.h
index dbe2b8ec902..a62fe973dfa 100644
--- a/src/server/shared/Networking/SocketMgr.h
+++ b/src/server/shared/Networking/SocketMgr.h
@@ -46,7 +46,16 @@ public:
             return false;
         }
 
-        _acceptor = new AsyncAcceptor(service, bindIp, port);
+        try
+        {
+            _acceptor = new AsyncAcceptor(service, bindIp, port);
+        }
+        catch (boost::system::system_error const& err)
+        {
+            TC_LOG_ERROR("network", "Exception caught in SocketMgr.StartNetwork (%s:%u): %s", bindIp.c_str(), port, err.what());
+            return false;
+        }
+
         _threads = CreateThreads();
 
         ASSERT(_threads);