Handle exceptions thrown by java.net.URI (#1918)

MozillaReality · Oct 7, 2019 · 5eb79ce · 5eb79ce
1 parent b22108a
commit 5eb79ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStack.java b/app/src/common/shared/org/mozilla/vrbrowser/browser/engine/SessionStack.java
@@ -793,11 +793,14 @@ public int getUaMode() {
     private static final String MOBILE_PREFIX = "mobile.";
 
     private String checkForMobileSite(String aUri) {
+        if (aUri == null) {
+            return null;
+        }
         String result = null;
         URI uri;
         try {
             uri = new URI(aUri);
-        } catch (URISyntaxException e) {
+        } catch (URISyntaxException | NullPointerException e) {
             Log.d(LOGTAG, "Error parsing URL: " + aUri + " " + e.getMessage());
             return null;
         }
@@ -816,7 +819,7 @@ private String checkForMobileSite(String aUri) {
             try {
                 uri = new URI(uri.getScheme(), authority.substring(foundPrefix.length()), uri.getPath(), uri.getQuery(), uri.getFragment());
                 result = uri.toString();
-            } catch (URISyntaxException e) {
+            } catch (URISyntaxException | NullPointerException e) {
                 Log.d(LOGTAG, "Error dropping mobile prefix from: " + aUri + " " + e.getMessage());
             }
         }

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/NavigationURLBar.java
@@ -313,8 +313,9 @@ public void setURL(String aURL) {
             try {
                 aURL = URLDecoder.decode(aURL, "UTF-8");
 
-            } catch (UnsupportedEncodingException e) {
+            } catch (UnsupportedEncodingException | IllegalArgumentException e) {
                 e.printStackTrace();
+                aURL = "";
             }
             if (aURL.startsWith("jar:")) {
                 return;