Merge pull request #2509 from sparklemotion/flavorjones-parse-process…

…ing-instructions-v1.13.x HTML parse processing instructions (backport to v1.13.x)
sparklemotion · Apr 10, 2022 · b848031 · b848031
2 parents c0ecf3b + 0feac5a
commit b848031
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 11 deletions.
diff --git a/lib/nekohtml.jar b/lib/nekohtml.jar
diff --git a/lib/nokogiri/xml/node.rb b/lib/nokogiri/xml/node.rb
@@ -123,7 +123,7 @@ class Node
       # [Yields] Nokogiri::XML::Node
       # [Returns] Nokogiri::XML::Node
       #
-      def initialize(name, document)
+      def initialize(name, document) # rubocop:disable Style/RedundantInitialize
         # This is intentionally empty.
       end
 

diff --git a/lib/nokogiri/xml/processing_instruction.rb b/lib/nokogiri/xml/processing_instruction.rb
@@ -3,7 +3,7 @@
 module Nokogiri
   module XML
     class ProcessingInstruction < Node
-      def initialize(document, name, content)
+      def initialize(document, name, content) # rubocop:disable Style/RedundantInitialize
       end
     end
   end

diff --git a/test/html4/test_document.rb b/test/html4/test_document.rb
@@ -727,6 +727,17 @@ def test_silencing_nonparse_errors_during_attribute_insertion_1262
           assert_equal(0, doc.errors.length)
         end
 
+        def test_leaking_dtd_nodes_after_internal_subset_removal
+          # see https://github.com/sparklemotion/nokogiri/issues/1784
+          #
+          # just checking that this doesn't raise a valgrind error. we
+          # don't otherwise have any test coverage for removing DTDs.
+          #
+          100.times do |_i|
+            Nokogiri::HTML::Document.new.internal_subset.remove
+          end
+        end
+
         it "skips encoding for script tags" do
           html = Nokogiri::HTML(<<~EOHTML)
             <html>
@@ -763,15 +774,17 @@ def test_silencing_nonparse_errors_during_attribute_insertion_1262
           assert_equal "ISO-8859-1", html.encoding.name
         end
 
-        def test_leaking_dtd_nodes_after_internal_subset_removal
-          # see https://github.com/sparklemotion/nokogiri/issues/1784
-          #
-          # just checking that this doesn't raise a valgrind error. we
-          # don't otherwise have any test coverage for removing DTDs.
-          #
-          100.times do |_i|
-            Nokogiri::HTML::Document.new.internal_subset.remove
+        it "handles ill-formed processing instructions" do
+          html = %{<html><body><!--><?a/}
+          doc = Nokogiri::HTML4::Document.parse(html)
+          expected = if Nokogiri.jruby?
+            [Nokogiri::XML::Node::COMMENT_NODE, Nokogiri::XML::Node::PI_NODE]
+          elsif Nokogiri.libxml2_patches.include?("0008-htmlParseComment-handle-abruptly-closed-comments.patch")
+            [Nokogiri::XML::Node::COMMENT_NODE]
+          else
+            []
           end
+          assert_equal(expected, doc.at_css("body").children.map(&:type))
         end
 
         describe ".parse" do

diff --git a/test/html4/test_element_description.rb b/test/html4/test_element_description.rb
@@ -43,7 +43,7 @@ def test_deprecated?
       end
 
       def test_inline?
-        assert_predicate(ElementDescription["a"], :inline?)
+        assert_predicate(ElementDescription["strong"], :inline?)
         refute_predicate(ElementDescription["div"], :inline?)
       end
 

diff --git a/test/html5/test_nokogumbo.rb b/test/html5/test_nokogumbo.rb
@@ -322,6 +322,20 @@ def test_line_cdata
     assert_equal(3, node.line)
   end
 
+  it "handles ill-formed processing instructions in a document" do
+    html = %{<html><body><!--><?a/}
+    doc = Nokogiri::HTML5::Document.parse(html)
+    expected = [Nokogiri::XML::Node::COMMENT_NODE, Nokogiri::XML::Node::COMMENT_NODE]
+    assert_equal(expected, doc.at_css("body").children.map(&:type))
+  end
+
+  it "handles ill-formed processing instructions in a fragment" do
+    html = %{<div><!--><?a/}
+    frag = Nokogiri::HTML5::DocumentFragment.parse(html)
+    expected = [Nokogiri::XML::Node::COMMENT_NODE, Nokogiri::XML::Node::COMMENT_NODE]
+    assert_equal(expected, frag.at_css("div").children.map(&:type))
+  end
+
   private
 
   def buffer