1 files changed, 8 insertions, 2 deletions
diff --git a/Swiften/Network/EnvironmentProxyProvider.cpp b/Swiften/Network/EnvironmentProxyProvider.cpp
index 8edb136..65cf4ff 100644
--- a/Swiften/Network/EnvironmentProxyProvider.cpp
+++ b/Swiften/Network/EnvironmentProxyProvider.cpp
@@ -11,18 +11,20 @@
  */
 
 #include <Swiften/Network/EnvironmentProxyProvider.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <iostream>
 
+#include <boost/numeric/conversion/cast.hpp>
+
 #include <Swiften/Base/Log.h>
 
 namespace Swift {
 
 EnvironmentProxyProvider::EnvironmentProxyProvider() {
     socksProxy = getFromEnv("all_proxy", "socks");
     httpProxy = getFromEnv("http_proxy", "http");
     SWIFT_LOG(debug) << "Environment: SOCKS5 => " << socksProxy.toString() << "; HTTP Connect => " << httpProxy.toString() << std::endl;
 }
@@ -32,25 +34,29 @@ HostAddressPort EnvironmentProxyProvider::getHTTPConnectProxy() const {
 }
 
 HostAddressPort EnvironmentProxyProvider::getSOCKS5Proxy() const {
     return socksProxy;
 }
 
 HostAddressPort EnvironmentProxyProvider::getFromEnv(const char* envVarName, std::string proxyProtocol) {
     char* envVar = nullptr;
     std::string address;
-    int port = 0;
+    unsigned short port = 0;
 
     envVar = getenv(envVarName);
 
     proxyProtocol += "://";
     address = envVar != nullptr ? envVar : "0.0.0.0";
     if(envVar != nullptr && address.compare(0, proxyProtocol.length(), proxyProtocol) == 0) {
         address = address.substr(proxyProtocol.length(), address.length());
-        port = atoi(address.substr(address.find(':') + 1, address.length()).c_str());
+        try {
+            port = boost::numeric_cast<unsigned short>(atoi(address.substr(address.find(':') + 1, address.length()).c_str()));
+        }
+        catch (boost::numeric::bad_numeric_cast&) {
+        }
         address = address.substr(0, address.find(':'));
     }
 
     return HostAddressPort(HostAddress::fromString(address).get_value_or(HostAddress()), port);
 }
 
 }