1 files changed, 8 insertions, 5 deletions
diff --git a/Swiften/Network/BoostConnectionServer.cpp b/Swiften/Network/BoostConnectionServer.cpp
index 34b5799..8db9656 100644
--- a/Swiften/Network/BoostConnectionServer.cpp
+++ b/Swiften/Network/BoostConnectionServer.cpp
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/Network/BoostConnectionServer.h>
 
 #include <boost/asio/ip/v6_only.hpp>
 #include <boost/asio/placeholders.hpp>
 #include <boost/bind.hpp>
@@ -13,57 +13,60 @@
 #include <boost/optional.hpp>
 #include <boost/system/error_code.hpp>
 #include <boost/system/system_error.hpp>
 
 #include <Swiften/Base/Log.h>
 #include <Swiften/EventLoop/EventLoop.h>
 
 namespace Swift {
 
-BoostConnectionServer::BoostConnectionServer(int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) : port_(port), ioService_(ioService), eventLoop(eventLoop), acceptor_(nullptr) {
+BoostConnectionServer::BoostConnectionServer(unsigned short port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) : port_(port), ioService_(ioService), eventLoop(eventLoop), acceptor_(nullptr) {
 }
 
-BoostConnectionServer::BoostConnectionServer(const HostAddress &address, int port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) : address_(address), port_(port), ioService_(ioService), eventLoop(eventLoop), acceptor_(nullptr) {
+BoostConnectionServer::BoostConnectionServer(const HostAddress &address, unsigned short port, std::shared_ptr<boost::asio::io_service> ioService, EventLoop* eventLoop) : address_(address), port_(port), ioService_(ioService), eventLoop(eventLoop), acceptor_(nullptr) {
 }
 
 void BoostConnectionServer::start() {
     boost::optional<Error> error = tryStart();
     if (error) {
         eventLoop->postEvent(boost::bind(boost::ref(onStopped), *error), shared_from_this());
     }
 }
 
 boost::optional<BoostConnectionServer::Error> BoostConnectionServer::tryStart() {
     try {
         assert(!acceptor_);
         boost::asio::ip::tcp::endpoint endpoint;
         if (address_.isValid()) {
-            endpoint = boost::asio::ip::tcp::endpoint(address_.getRawAddress(), boost::numeric_cast<unsigned short>(port_));
+            endpoint = boost::asio::ip::tcp::endpoint(address_.getRawAddress(), port_);
         }
         else {
-            endpoint = boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v6(), boost::numeric_cast<unsigned short>(port_));
+            endpoint = boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v6(), port_);
         }
         acceptor_ = new boost::asio::ip::tcp::acceptor(*ioService_, endpoint);
         if (endpoint.protocol() ==  boost::asio::ip::tcp::v6()) {
             boost::system::error_code ec;
             acceptor_->set_option(boost::asio::ip::v6_only(false), ec);
             SWIFT_LOG_ASSERT(ec, warning) << "IPv4/IPv6 dual-stack support is not supported on this platform." << std::endl;
         }
         acceptNextConnection();
     }
     catch (const boost::system::system_error& e) {
         if (e.code() == boost::asio::error::address_in_use) {
             return Conflict;
         }
         else {
             return UnknownError;
         }
     }
+    catch (const boost::numeric::bad_numeric_cast&) {
+        return UnknownError;
+    }
     return boost::optional<Error>();
 }
 
 
 void BoostConnectionServer::stop() {
     stop(boost::optional<Error>());
 }
 
 void BoostConnectionServer::stop(boost::optional<Error> e) {