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

---
 .../btr/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/btr/proxy/search/desktop/gnome')

diff --git a/src/main/java/com/btr/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java b/src/main/java/com/btr/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java
index 10d237a..00f7fcc 100644
--- a/src/main/java/com/btr/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java
+++ b/src/main/java/com/btr/proxy/search/desktop/gnome/GnomeProxySearchStrategy.java
@@ -23,6 +23,7 @@ import com.btr.proxy.selector.whitelist.ProxyBypassListSelector;
 import com.btr.proxy.util.EmptyXMLResolver;
 import com.btr.proxy.util.Logger;
 import com.btr.proxy.util.Logger.LogLevel;
+import com.btr.proxy.util.MiscUtil;
 import com.btr.proxy.util.ProxyException;
 import com.btr.proxy.util.ProxyUtil;
 
@@ -218,7 +219,7 @@ public class GnomeProxySearchStrategy implements ProxySearchStrategy {
 	private void installHttpSelector(Properties settings,
 			ProtocolDispatchSelector ps) throws NumberFormatException {
 		String proxyHost = settings.getProperty("/system/http_proxy/host", null);
-		int proxyPort = Integer.parseInt(settings.getProperty("/system/http_proxy/port", "0").trim());
+		int proxyPort = MiscUtil.parseInt(settings.getProperty("/system/http_proxy/port", "0").trim());
 		if (proxyHost != null && proxyHost.length() > 0) {
 			Logger.log(getClass(), LogLevel.TRACE, "Gnome http proxy is {0}:{1}", proxyHost, proxyPort);
 			ps.setSelector("http", ProxyUtil.parseProxySettings(proxyHost.trim(), Proxy.Type.HTTP, proxyPort));
@@ -235,7 +236,7 @@ public class GnomeProxySearchStrategy implements ProxySearchStrategy {
 	private void installSocksSelector(Properties settings,
 			ProtocolDispatchSelector ps) throws NumberFormatException {
 		String proxyHost = settings.getProperty("/system/proxy/socks_host", null);
-		int proxyPort = Integer.parseInt(settings.getProperty("/system/proxy/socks_port", "0").trim());
+		int proxyPort = MiscUtil.parseInt(settings.getProperty("/system/proxy/socks_port", "0").trim());
 		if (proxyHost != null && proxyHost.length() > 0) {
 			Logger.log(getClass(), LogLevel.TRACE, "Gnome socks proxy is {0}:{1}", proxyHost, proxyPort);
 			ps.setSelector("socks", ProxyUtil.parseProxySettings(proxyHost.trim(), Proxy.Type.SOCKS, proxyPort));
@@ -251,7 +252,7 @@ public class GnomeProxySearchStrategy implements ProxySearchStrategy {
 	private void installFtpSelector(Properties settings,
 			ProtocolDispatchSelector ps) throws NumberFormatException {
 		String proxyHost = settings.getProperty("/system/proxy/ftp_host", null);
-		int proxyPort = Integer.parseInt(settings.getProperty("/system/proxy/ftp_port", "0").trim());
+		int proxyPort = MiscUtil.parseInt(settings.getProperty("/system/proxy/ftp_port", "0").trim());
 		if (proxyHost != null && proxyHost.length() > 0) {
 			Logger.log(getClass(), LogLevel.TRACE, "Gnome ftp proxy is {0}:{1}", proxyHost, proxyPort);
 			ps.setSelector("ftp", ProxyUtil.parseProxySettings(proxyHost.trim(), Proxy.Type.HTTP, proxyPort));
@@ -268,7 +269,7 @@ public class GnomeProxySearchStrategy implements ProxySearchStrategy {
 	private void installSecureSelector(Properties settings,
 			ProtocolDispatchSelector ps) throws NumberFormatException {
 		String proxyHost = settings.getProperty("/system/proxy/secure_host", null);
-		int proxyPort = Integer.parseInt(settings.getProperty("/system/proxy/secure_port", "0").trim());
+		int proxyPort = MiscUtil.parseInt(settings.getProperty("/system/proxy/secure_port", "0").trim());
 		if (proxyHost != null && proxyHost.length() > 0) {
 			Logger.log(getClass(), LogLevel.TRACE, "Gnome secure proxy is {0}:{1}", proxyHost, proxyPort);
 			ProxySelector ps2 = ProxyUtil.parseProxySettings(proxyHost.trim(), Proxy.Type.HTTP, proxyPort);
-- 
cgit v1.2.3-55-g7522