Merge pull request #835 from zbum/feature/socks5

fix array out of bound error
scouter-project · Nov 30, 2021 · 134e5f1 · 134e5f1
2 parents 535b20a + 37eb75c
commit 134e5f1
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/scouter.client/src/scouter/client/popup/LoginDialog2.java b/scouter.client/src/scouter/client/popup/LoginDialog2.java
@@ -289,14 +289,17 @@ public boolean loginInToServer(String address, String socksAddress) {
 			ip = addr[0];
 			port = addr[1];
 
-			String socksIp;
-			String socksPort;
-			if (!socksAddress.contains(":")) {
-				errMsg("Check SOCKS Address");
+			String socksIp = null;
+			String socksPort = null;
+			if (this.sock5Login) {
+				if (StringUtil.isEmpty(socksAddress) || !socksAddress.contains(":")) {
+					errMsg("Check SOCKS Address");
+					return false;
+				}
+				String[] socksAddr = socksAddress.split(":");
+				socksIp = socksAddr[0];
+				socksPort = socksAddr[1];
 			}
-			String[] socksAddr = socksAddress.split(":");
-			socksIp = socksAddr[0];
-			socksPort = socksAddr[1];
 
 			msg("Log in..." + address);