From a3982900a3c2d586e1b6acd6343ecde9fa37fc46 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 9 Aug 2017 16:58:51 +0200
Subject: Prevent NumberFormatExceptions from breaking everything; NPE in
 PacProxySelector

---
 src/main/java/com/btr/proxy/util/ProxyUtil.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/java/com/btr/proxy/util/ProxyUtil.java')

diff --git a/src/main/java/com/btr/proxy/util/ProxyUtil.java b/src/main/java/com/btr/proxy/util/ProxyUtil.java
index bfb3f70..857b680 100644
--- a/src/main/java/com/btr/proxy/util/ProxyUtil.java
+++ b/src/main/java/com/btr/proxy/util/ProxyUtil.java
@@ -76,7 +76,7 @@ public class ProxyUtil {
 		} else {
 			String portStr = proxyVar.substring(portIdx + 1).replaceAll("[^0-9]", "");
 			if (!portStr.isEmpty()) {
-				port = Integer.parseInt(portStr);
+				port = MiscUtil.parseInt(portStr);
 			}
 			host = proxyVar.substring(0, portIdx);
 		}
@@ -84,7 +84,7 @@ public class ProxyUtil {
 		if (port == -1 && fallbackPort > 0) {
 			port = fallbackPort;
 		}
-		if (port == -1) {
+		if (port < 0 || port > 65535) {
 			if (type == Proxy.Type.HTTP) {
 				port = DEFAULT_HTTP_PROXY_PORT;
 			} else if (type == Proxy.Type.SOCKS) {
-- 
cgit v1.2.3-55-g7522