NPE handled for empty URL string

wiztools · Jan 15, 2025 · 3292052 · 3292052
1 parent e4d2105
commit 3292052
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/src/main/java/org/wiztools/restclient/util/Url.java b/lib/src/main/java/org/wiztools/restclient/util/Url.java
@@ -5,6 +5,9 @@
 
 public class Url {
     public static java.net.URL get(String spec) throws MalformedURLException {
+        if(spec == null || spec.trim().isEmpty()) {
+            throw new MalformedURLException("URL is empty");
+        }
         try {
             return new java.net.URI(spec).toURL();
         } catch(URISyntaxException ex) {

diff --git a/ui/src/main/java/org/wiztools/restclient/ui/RESTViewImpl.java b/ui/src/main/java/org/wiztools/restclient/ui/RESTViewImpl.java
@@ -8,7 +8,6 @@
 import java.io.File;
 import java.net.HttpCookie;
 import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -26,6 +25,7 @@
 import org.wiztools.restclient.IGlobalOptions;
 import org.wiztools.restclient.ServiceLocator;
 import org.wiztools.restclient.bean.*;
+import org.wiztools.restclient.util.Url;
 import org.wiztools.restclient.ui.dnd.FileDropTargetListener;
 import org.wiztools.restclient.ui.history.HistoryManager;
 import org.wiztools.restclient.ui.reqauth.ReqAuthPanel;
@@ -254,8 +254,11 @@ public Request getRequestFromUI() throws IllegalStateException {
         request.setAuth(auth);
 
         String url = jp_url_go.getUrlString();
+        if(url == null || url.isEmpty()) {
+            throw new IllegalStateException("URL is empty");
+        }
         try{
-            request.setUrl(org.wiztools.restclient.util.Url.get(url));
+            request.setUrl(Url.get(url));
         }
         catch(MalformedURLException ex){
             throw new IllegalStateException("URL is malformed", ex);