1 files changed, 10 insertions, 4 deletions
diff --git a/Swiften/Network/EnvironmentProxyProvider.cpp b/Swiften/Network/EnvironmentProxyProvider.cpp
index 8edb136..6fbf373 100644
--- a/Swiften/Network/EnvironmentProxyProvider.cpp
+++ b/Swiften/Network/EnvironmentProxyProvider.cpp
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2016 Isode Limited.
+ * Copyright (c) 2016-2019 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -17,6 +17,8 @@
 
 #include <iostream>
 
+#include <boost/numeric/conversion/cast.hpp>
+
 #include <Swiften/Base/Log.h>
 
 namespace Swift {
@@ -24,7 +26,7 @@ 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;
+    SWIFT_LOG(debug) << "Environment: SOCKS5 => " << socksProxy.toString() << "; HTTP Connect => " << httpProxy.toString();
 }
 
 HostAddressPort EnvironmentProxyProvider::getHTTPConnectProxy() const {
@@ -38,7 +40,7 @@ HostAddressPort EnvironmentProxyProvider::getSOCKS5Proxy() const {
 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);
 
@@ -46,7 +48,11 @@ HostAddressPort EnvironmentProxyProvider::getFromEnv(const char* envVarName, std
     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(':'));
     }