1 files changed, 35 insertions, 21 deletions
diff --git a/Swiften/Network/EnvironmentProxyProvider.cpp b/Swiften/Network/EnvironmentProxyProvider.cpp
index 7701da1..6fbf373 100644
--- a/Swiften/Network/EnvironmentProxyProvider.cpp
+++ b/Swiften/Network/EnvironmentProxyProvider.cpp
@@ -4,45 +4,59 @@
  * See Documentation/Licenses/BSD-simplified.txt for more information.
  */
 
+/*
+ * Copyright (c) 2016-2019 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <Swiften/Network/EnvironmentProxyProvider.h>
+
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <iostream>
 
+#include <boost/numeric/conversion/cast.hpp>
+
 #include <Swiften/Base/Log.h>
-#include <Swiften/Network/EnvironmentProxyProvider.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;
+    socksProxy = getFromEnv("all_proxy", "socks");
+    httpProxy = getFromEnv("http_proxy", "http");
+    SWIFT_LOG(debug) << "Environment: SOCKS5 => " << socksProxy.toString() << "; HTTP Connect => " << httpProxy.toString();
 }
 
 HostAddressPort EnvironmentProxyProvider::getHTTPConnectProxy() const {
-	return httpProxy;
+    return httpProxy;
 }
 
 HostAddressPort EnvironmentProxyProvider::getSOCKS5Proxy() const {
-	return socksProxy;
+    return socksProxy;
 }
 
 HostAddressPort EnvironmentProxyProvider::getFromEnv(const char* envVarName, std::string proxyProtocol) {
-	char* envVar = NULL;
-	std::string address;
-	int port = 0;
-
-	envVar = getenv(envVarName);
-
-	proxyProtocol += "://";
-	address = envVar != NULL ? envVar : "0.0.0.0";
-	if(envVar != NULL && 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());
-		address = address.substr(0, address.find(':'));
-	}
-
-	return HostAddressPort(HostAddress(address), port);
+    char* envVar = nullptr;
+    std::string address;
+    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());
+        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);
 }
 
 }