diff options
author | Simon Rettberg | 2017-08-09 16:58:51 +0200 |
---|---|---|
committer | Simon Rettberg | 2017-08-09 16:58:51 +0200 |
commit | a3982900a3c2d586e1b6acd6343ecde9fa37fc46 (patch) | |
tree | bde25aea72f0630ebb6a35a9e9bc4eeb76fcf4e1 /src/main/java/com/btr/proxy/util/ProxyUtil.java | |
parent | Sophisticate proxy parsing and generating, fix misinterpretation if SOCKS pro... (diff) | |
download | proxy-vole-a3982900a3c2d586e1b6acd6343ecde9fa37fc46.tar.gz proxy-vole-a3982900a3c2d586e1b6acd6343ecde9fa37fc46.tar.xz proxy-vole-a3982900a3c2d586e1b6acd6343ecde9fa37fc46.zip |
Prevent NumberFormatExceptions from breaking everything; NPE in PacProxySelector
Diffstat (limited to 'src/main/java/com/btr/proxy/util/ProxyUtil.java')
-rw-r--r-- | src/main/java/com/btr/proxy/util/ProxyUtil.java | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |