nokogiri 1.10.8-x86-mingw32 → 1.11.0.rc3-x86-mingw32

data/ext/nokogiri/xml_schema.c

@@ -133,6 +133,31 @@ static VALUE read_memory(VALUE klass, VALUE content)
   return rb_schema;
 }
 
+/* Schema creation will remove and deallocate "blank" nodes.
+ * If those blank nodes have been exposed to Ruby, they could get freed
+ * out from under the VALUE pointer.  This function checks to see if any of
+ * those nodes have been exposed to Ruby, and if so we should raise an exception.
+ */
+static int has_blank_nodes_p(VALUE cache)
+{
+    long i;
+
+    if (NIL_P(cache)) {
+        return 0;
+    }
+
+    for (i = 0; i < RARRAY_LEN(cache); i++) {
+        xmlNodePtr node;
+        VALUE element = rb_ary_entry(cache, i);
+        Data_Get_Struct(element, xmlNode, node);
+        if (xmlIsBlankNode(node)) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
 /*
  * call-seq:
  *  from_document(doc)
@@ -152,6 +177,10 @@ static VALUE from_document(VALUE klass, VALUE document)
   /* In case someone passes us a node. ugh. */
   doc = doc->doc;
 
+  if (has_blank_nodes_p(DOC_NODE_CACHE(doc))) {
+    rb_raise(rb_eArgError, "Creating a schema from a document that has blank nodes exposed to Ruby is dangerous");
+  }
+
   ctx = xmlSchemaNewDocParserCtxt(doc);
 
   errors = rb_ary_new();

data/ext/nokogiri/xslt_stylesheet.c

@@ -109,10 +109,6 @@ static VALUE serialize(VALUE self, VALUE xmlobj)
     return rval ;
 }
 
-static void swallow_superfluous_xml_errors(void * userdata, xmlErrorPtr error, ...)
-{
-}
-
 /*
  *  call-seq:
  *    transform(document, params = [])

data/lib/nokogiri.rb

@@ -1,28 +1,11 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 # Modify the PATH on windows so that the external DLLs will get loaded.
 
 require 'rbconfig'
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-  # The line below caused a problem on non-GAE rack environment.
-  # unless defined?(JRuby::Rack::VERSION) || defined?(AppEngine::ApiProxy)
-  #
-  # However, simply cutting defined?(JRuby::Rack::VERSION) off resulted in
-  # an unable-to-load-nokogiri problem. Thus, now, Nokogiri checks the presense
-  # of appengine-rack.jar in $LOAD_PATH. If Nokogiri is on GAE, Nokogiri
-  # should skip loading xml jars. This is because those are in WEB-INF/lib and
-  # already set in the classpath.
-  unless $LOAD_PATH.to_s.include?("appengine-rack")
-    require 'stringio'
-    require 'isorelax.jar'
-    require 'jing.jar'
-    require 'nekohtml.jar'
-    require 'nekodtd.jar'
-    require 'xercesImpl.jar'
-    require 'serializer.jar'
-    require 'xalan.jar'
-    require 'xml-apis.jar'
-  end
+  require 'nokogiri/jruby/dependencies'
 end
 
 begin
@@ -54,7 +37,7 @@ require 'nokogiri/html/builder'
 #
 #   # Get a Nokogiri::HTML:Document for the page we’re interested in...
 #
-#   doc = Nokogiri::HTML(open('http://www.google.com/search?q=tenderlove'))
+#   doc = Nokogiri::HTML(URI.open('http://www.google.com/search?q=tenderlove'))
 #
 #   # Do funky things with it using Nokogiri::XML::Node methods...
 #

data/lib/nokogiri/css.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'nokogiri/css/node'
 require 'nokogiri/css/xpath_visitor'
 x = $-w

data/lib/nokogiri/css/node.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Nokogiri
   module CSS
     class Node

data/lib/nokogiri/css/parser.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.14
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.4.16
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -333,42 +334,42 @@ Racc_debug_parser = false
 
 def _reduce_1(val, _values, result)
         result = [val.first, val.last].flatten
-      
+
     result
 end
 
 def _reduce_2(val, _values, result)
- result = val.flatten 
+ result = val.flatten
     result
 end
 
 def _reduce_3(val, _values, result)
- result = [val.last].flatten 
+ result = [val.last].flatten
     result
 end
 
 def _reduce_4(val, _values, result)
- result = :DIRECT_ADJACENT_SELECTOR 
+ result = :DIRECT_ADJACENT_SELECTOR
     result
 end
 
 def _reduce_5(val, _values, result)
- result = :CHILD_SELECTOR 
+ result = :CHILD_SELECTOR
     result
 end
 
 def _reduce_6(val, _values, result)
- result = :FOLLOWING_SELECTOR 
+ result = :FOLLOWING_SELECTOR
     result
 end
 
 def _reduce_7(val, _values, result)
- result = :DESCENDANT_SELECTOR 
+ result = :DESCENDANT_SELECTOR
     result
 end
 
 def _reduce_8(val, _values, result)
- result = :CHILD_SELECTOR 
+ result = :CHILD_SELECTOR
     result
 end
 
@@ -378,7 +379,7 @@ def _reduce_9(val, _values, result)
                   else
                     Node.new(:CONDITIONAL_SELECTOR, [val.first, val[1]])
                   end
-      
+
     result
 end
 
@@ -386,13 +387,13 @@ end
 
 def _reduce_11(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR, val)
-      
+
     result
 end
 
 def _reduce_12(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR, val)
-      
+
     result
 end
 
@@ -400,39 +401,39 @@ def _reduce_13(val, _values, result)
         result = Node.new(:CONDITIONAL_SELECTOR,
           [Node.new(:ELEMENT_NAME, ['*']), val.first]
         )
-      
+
     result
 end
 
 def _reduce_14(val, _values, result)
         result = Node.new(val.first, [nil, val.last])
-      
+
     result
 end
 
 def _reduce_15(val, _values, result)
         result = Node.new(val[1], [val.first, val.last])
-      
+
     result
 end
 
 def _reduce_16(val, _values, result)
         result = Node.new(:DESCENDANT_SELECTOR, [val.first, val.last])
-      
+
     result
 end
 
 # reduce 17 omitted
 
 def _reduce_18(val, _values, result)
- result = Node.new(:CLASS_CONDITION, [unescape_css_identifier(val[1])]) 
+ result = Node.new(:CLASS_CONDITION, [unescape_css_identifier(val[1])])
     result
 end
 
 # reduce 19 omitted
 
 def _reduce_20(val, _values, result)
- result = Node.new(:ELEMENT_NAME, val) 
+ result = Node.new(:ELEMENT_NAME, val)
     result
 end
 
@@ -440,19 +441,19 @@ def _reduce_21(val, _values, result)
         result = Node.new(:ELEMENT_NAME,
           [[val.first, val.last].compact.join(':')]
         )
-      
+
     result
 end
 
 def _reduce_22(val, _values, result)
         name = @namespaces.key?('xmlns') ? "xmlns:#{val.first}" : val.first
         result = Node.new(:ELEMENT_NAME, [name])
-      
+
     result
 end
 
 def _reduce_23(val, _values, result)
- result = val[0] 
+ result = val[0]
     result
 end
 
@@ -462,7 +463,7 @@ def _reduce_25(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
-      
+
     result
 end
 
@@ -470,7 +471,7 @@ def _reduce_26(val, _values, result)
         result = Node.new(:ATTRIBUTE_CONDITION,
           [val[1]] + (val[2] || [])
         )
-      
+
     result
 end
 
@@ -479,7 +480,7 @@ def _reduce_27(val, _values, result)
         result = Node.new(:PSEUDO_CLASS,
           [Node.new(:FUNCTION, ['nth-child(', val[1]])]
         )
-      
+
     result
 end
 
@@ -487,7 +488,7 @@ def _reduce_28(val, _values, result)
         result = Node.new(:ELEMENT_NAME,
           [[val.first, val.last].compact.join(':')]
         )
-      
+
     result
 end
 
@@ -495,52 +496,52 @@ def _reduce_29(val, _values, result)
         # Default namespace is not applied to attributes.
         # So we don't add prefix "xmlns:" as in namespaced_ident.
         result = Node.new(:ELEMENT_NAME, [val.first])
-      
+
     result
 end
 
 def _reduce_30(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip])
-      
+
     result
 end
 
 def _reduce_31(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+
     result
 end
 
 def _reduce_32(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+
     result
 end
 
 def _reduce_33(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+
     result
 end
 
 def _reduce_34(val, _values, result)
         result = Node.new(:FUNCTION, [val.first.strip, val[1]].flatten)
-      
+
     result
 end
 
 def _reduce_35(val, _values, result)
- result = [val.first, val.last] 
+ result = [val.first, val.last]
     result
 end
 
 def _reduce_36(val, _values, result)
- result = [val.first, val.last] 
+ result = [val.first, val.last]
     result
 end
 
 def _reduce_37(val, _values, result)
- result = [val.first, val.last] 
+ result = [val.first, val.last]
     result
 end
 
@@ -563,7 +564,7 @@ def _reduce_40(val, _values, result)
           # assert_xpath("//a[foo(., a, 10)]", @parser.parse('a:foo(a, 10)'))
           result = val
         end
-      
+
     result
 end
 
@@ -573,7 +574,7 @@ def _reduce_41(val, _values, result)
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
         end
-      
+
     result
 end
 
@@ -589,7 +590,7 @@ def _reduce_42(val, _values, result)
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
         end
-      
+
     result
 end
 
@@ -609,18 +610,18 @@ def _reduce_43(val, _values, result)
         else
           raise Racc::ParseError, "parse error on IDENT '#{val[1]}'"
         end
-      
+
     result
 end
 
 def _reduce_44(val, _values, result)
         result = Node.new(:PSEUDO_CLASS, [val[1]])
-      
+
     result
 end
 
 def _reduce_45(val, _values, result)
- result = Node.new(:PSEUDO_CLASS, [val[1]]) 
+ result = Node.new(:PSEUDO_CLASS, [val[1]])
     result
 end
 
@@ -630,31 +631,31 @@ end
 
 def _reduce_48(val, _values, result)
         result = Node.new(:COMBINATOR, val)
-      
+
     result
 end
 
 def _reduce_49(val, _values, result)
         result = Node.new(:COMBINATOR, val)
-      
+
     result
 end
 
 def _reduce_50(val, _values, result)
         result = Node.new(:COMBINATOR, val)
-      
+
     result
 end
 
 def _reduce_51(val, _values, result)
         result = Node.new(:COMBINATOR, val)
-      
+
     result
 end
 
 def _reduce_52(val, _values, result)
         result = Node.new(:COMBINATOR, val)
-      
+
     result
 end
 
@@ -669,65 +670,65 @@ end
 # reduce 57 omitted
 
 def _reduce_58(val, _values, result)
- result = Node.new(:ID, [unescape_css_identifier(val.first)]) 
+ result = Node.new(:ID, [unescape_css_identifier(val.first)])
     result
 end
 
 def _reduce_59(val, _values, result)
- result = [val.first, unescape_css_identifier(val[1])] 
+ result = [val.first, unescape_css_identifier(val[1])]
     result
 end
 
 def _reduce_60(val, _values, result)
- result = [val.first, unescape_css_string(val[1])] 
+ result = [val.first, unescape_css_string(val[1])]
     result
 end
 
 def _reduce_61(val, _values, result)
- result = [val.first, val[1]] 
+ result = [val.first, val[1]]
     result
 end
 
 # reduce 62 omitted
 
 def _reduce_63(val, _values, result)
- result = :equal 
+ result = :equal
     result
 end
 
 def _reduce_64(val, _values, result)
- result = :prefix_match 
+ result = :prefix_match
     result
 end
 
 def _reduce_65(val, _values, result)
- result = :suffix_match 
+ result = :suffix_match
     result
 end
 
 def _reduce_66(val, _values, result)
- result = :substring_match 
+ result = :substring_match
     result
 end
 
 def _reduce_67(val, _values, result)
- result = :not_equal 
+ result = :not_equal
     result
 end
 
 def _reduce_68(val, _values, result)
- result = :includes 
+ result = :includes
     result
 end
 
 def _reduce_69(val, _values, result)
- result = :dash_match 
+ result = :dash_match
     result
 end
 
 def _reduce_70(val, _values, result)
         result = Node.new(:NOT, [val[1]])
-      
+
     result
 end
 
@@ -746,5 +747,5 @@ def _reduce_none(val, _values, result)
 end
 
     end   # class Parser
-    end   # module CSS
-  end   # module Nokogiri
+  end   # module CSS
+end   # module Nokogiri