Merge pull request #28 from sideshowbarker/master

Prevent NPE for relative fragment w/ base != null.
smola · Mar 12, 2014 · 5ffa96c · 5ffa96c
2 parents 819cc1d + cb2907d
commit 5ffa96c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/io/mola/galimatias/URLParser.java b/src/main/java/io/mola/galimatias/URLParser.java
@@ -377,7 +377,7 @@ else if (c == '#') {
                         host = (base == null)? null : base.host();
                         port = (base == null || base.port() == base.defaultPort())? -1 : base.port();
                         pathSegments = (base == null)? null : base.pathSegments();
-                        query = (base == null)? null : new StringBuilder(base.query());
+                        query = (base == null || base.query() == null)? null : new StringBuilder(base.query());
                         fragment = new StringBuilder();
                         state = ParseURLState.FRAGMENT;
                     } else {

diff --git a/src/test/java/io/mola/galimatias/URL2Test.java b/src/test/java/io/mola/galimatias/URL2Test.java
@@ -381,6 +381,11 @@ public void testRelativeWithScheme() throws Exception {
         assertEquals("http://host/", URL.parse(base, "http:/").toString());
     }
 
+    public void testRelativeFragmentOnly() throws Exception {
+        URL base = URL.parse("http://host/a/b/c");
+        assertEquals("http://host/a/b/c#", URL.parse(base, "#").toString());
+    }
+
     public void testMalformedUrlsRefusedByFirefoxAndChrome() throws Exception {
         URL base = URL.parse("http://host/a/b/c");
         // All these are Ok in android, not in galimatias