Merge pull request #805 from lcdhoffman/master

Fix EmptyStackException thrown by nokogiri-java when an xlink:href attribute shows up with an empty XmlBaseStack
sparklemotion · Mar 19, 2013 · 095016f · 095016f
2 parents 05eff2f + 6dc3379
commit 095016f
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/ext/java/nokogiri/internals/ReaderNode.java b/ext/java/nokogiri/internals/ReaderNode.java
@@ -396,9 +396,12 @@ private String getXmlBaseUri(String n, String v, Stack<String> xmlBaseStack) {
                     else return base.concat("/").concat(v);
                 }
             } else if ("xlink:href".equals(n)) {
+							if (v.startsWith("http://")) {
+								return v;
+							} else if (!xmlBaseStack.isEmpty()) {
                 String base = xmlBaseStack.peek();
-                if (base.endsWith("/")) return base.concat(v);
-                else return base.concat("/").concat(v);
+								return base;
+							}
             }
             return null;
         }

diff --git a/test/test_reader.rb b/test/test_reader.rb
@@ -433,6 +433,39 @@ def test_base_uri
                   reader.map {|n| n.base_uri })
   end
 
+  def test_xlink_href_without_base_uri
+    reader = Nokogiri::XML::Reader(<<-eoxml)
+      <x xmlns:xlink="http://www.w3.org/1999/xlink">
+        <link xlink:href="#other">Link</link>
+        <other id="other">Linked Element</other>
+      </x>
+    eoxml
+
+    reader.each do |node|
+      if node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
+        if node.name == 'link'
+          assert_nil node.base_uri
+        end
+      end
+    end
+  end
+
+  def test_xlink_href_with_base_uri
+    reader = Nokogiri::XML::Reader(<<-eoxml)
+      <x xml:base="http://base.example.org/base/"
+         xmlns:xlink="http://www.w3.org/1999/xlink">
+        <link xlink:href="#other">Link</link>
+        <other id="other">Linked Element</other>
+      </x>
+    eoxml
+
+    reader.each do |node|
+      if node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
+        assert_equal node.base_uri, "http://base.example.org/base/"
+      end
+    end
+  end
+
   def test_read_from_memory
     called = false
     reader = Nokogiri::XML::Reader.from_memory('<foo>bar</foo>')