From 3eb120ab507aa65e452d21a63ff500254129c262 Mon Sep 17 00:00:00 2001 From: Nayd Date: Sun, 16 Nov 2014 20:08:28 +0000 Subject: Core/Networking: Catch possible boost exception in StartNetwork Closes #13557 --- src/server/shared/Networking/SocketMgr.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/server/shared') diff --git a/src/server/shared/Networking/SocketMgr.h b/src/server/shared/Networking/SocketMgr.h index 92c16d96882..c004295bc1a 100644 --- a/src/server/shared/Networking/SocketMgr.h +++ b/src/server/shared/Networking/SocketMgr.h @@ -47,7 +47,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); -- cgit v1.2.3