nokogiri 1.11.0-x86-linux → 1.11.1-x86-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d1976c09bf456fba53439d4e45e24e42341cc22d891600ad9732a0e77c728da
-  data.tar.gz: 334a2a56e23f813e52e75a28659f1ef09b69972ccc4956ddd5ec3b257a4ccfae
+  metadata.gz: 59f84db1e9fc9830e5d944f6dcb726969eb9f4f19b47e6a2bf9837575859e8c0
+  data.tar.gz: 94efed916a65c193c8819e1e42c484da77e4dc7a76c5b398feceebfc1ac2a9d7
 SHA512:
-  metadata.gz: c631bede17614addda390a00a8a552cd99fb6b0451684169fa58cc14383fe2e2af11f2e1bf7e20effb7ce7f5eb3f65a095ae77ee02c6dd84c55c72ef79f3d266
-  data.tar.gz: e2eb955b5bb57871af845e6db531436ca70cf9e7c20b64cc18c6efbc22dd28b1df01e3cbebfd41a95ce7ffe76828efe4eb7d0f5ce2dfeb8e4352af93b30d31c8
+  metadata.gz: 9d46b193f21983ebcfcec85ddf8b82a8256e551e69f8d53f1e558b42f6f7965d597a70c0f350ffbaa577e98d3b2e7bd247473b0a6d8a868bf04dae9021f218ad
+  data.tar.gz: 316c4d564caecfdd54a472eb3b2c343040fca7a71a0fafb8df32f4fd3970c5b4362eba0020e45cc758c90915419e62106220ce3b22d0bfd1901d2decd5d3a9a0

data/ext/nokogiri/html_sax_parser_context.c

@@ -92,6 +92,8 @@ parse_with(VALUE self, VALUE sax_handler)
     ctxt->sax = sax;
     ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);
 
+    xmlSetStructuredErrorFunc(NULL, NULL);
+
     rb_ensure(parse_doc, (VALUE)ctxt, parse_doc_finalize, (VALUE)ctxt);
 
     return self;

data/ext/nokogiri/html_sax_push_parser.c

@@ -9,9 +9,10 @@
 static VALUE native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
 {
   xmlParserCtxtPtr ctx;
-  const char * chunk  = NULL;
-  int size            = 0;
-
+  const char * chunk = NULL;
+  int size = 0;
+  int status = 0;
+  libxmlStructuredErrorHandlerState handler_state;
 
   Data_Get_Struct(self, xmlParserCtxt, ctx);
 
@@ -20,11 +21,16 @@ static VALUE native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
     size = (int)RSTRING_LEN(_chunk);
   }
 
-  if(htmlParseChunk(ctx, chunk, size, Qtrue == _last_chunk ? 1 : 0)) {
-    if (!(ctx->options & XML_PARSE_RECOVER)) {
-      xmlErrorPtr e = xmlCtxtGetLastError(ctx);
-      Nokogiri_error_raise(NULL, e);
-    }
+  Nokogiri_structured_error_func_save_and_set(&handler_state, NULL, NULL);
+
+  status = htmlParseChunk(ctx, chunk, size, Qtrue == _last_chunk ? 1 : 0);
+
+  Nokogiri_structured_error_func_restore(&handler_state);
+
+  if ((status != 0) && !(ctx->options & XML_PARSE_RECOVER)) {
+    // TODO: there appear to be no tests for this block
+    xmlErrorPtr e = xmlCtxtGetLastError(ctx);
+    Nokogiri_error_raise(NULL, e);
   }
 
   return self;

data/ext/nokogiri/nokogiri.c

@@ -1,5 +1,7 @@
 #include <nokogiri.h>
 
+void init_test_global_handlers(); /* in lieu of test_global_handlers.h */
+
 VALUE mNokogiri ;
 VALUE mNokogiriXml ;
 VALUE mNokogiriHtml ;
@@ -132,4 +134,5 @@ void Init_nokogiri()
   init_xml_relax_ng();
   init_nokogiri_io();
   init_xml_encoding_handler();
+  init_test_global_handlers();
 }

data/ext/nokogiri/test_global_handlers.c

@@ -0,0 +1,41 @@
+#include <nokogiri.h>
+#include "libxml/xmlerror.h"
+
+static VALUE foreign_error_handler_block = Qnil;
+
+static void foreign_error_handler(void* user_data, xmlErrorPtr c_error)
+{
+  rb_funcall(foreign_error_handler_block, rb_intern("call"), 0);
+}
+
+/*
+ * call-seq:
+ *   __foreign_error_handler { ... } -> nil
+ *
+ * Override libxml2's global error handlers to call the block. This method thus has very little
+ * value except to test that Nokogiri is properly setting error handlers elsewhere in the code. See
+ * test/helper.rb for how this is being used.
+ */
+static VALUE
+rb_foreign_error_handler(VALUE klass)
+{
+  rb_need_block();
+  foreign_error_handler_block = rb_block_proc();
+  xmlSetStructuredErrorFunc(NULL, foreign_error_handler);
+  return Qnil;
+}
+
+/*
+ *  Document-module: Nokogiri::Test
+ *
+ *  The Nokogiri::Test module should only be used for testing Nokogiri.
+ *  Do NOT use this outside of the Nokogiri test suite.
+ */
+void
+init_test_global_handlers()
+{
+  VALUE mNokogiri = rb_define_module("Nokogiri");
+  VALUE mNokogiriTest = rb_define_module_under(mNokogiri, "Test");
+
+  rb_define_singleton_method(mNokogiriTest, "__foreign_error_handler", rb_foreign_error_handler, 0);
+}

data/ext/nokogiri/xml_sax_parser_context.c

@@ -120,6 +120,8 @@ parse_with(VALUE self, VALUE sax_handler)
     ctxt->sax = sax;
     ctxt->userData = (void *)NOKOGIRI_SAX_TUPLE_NEW(ctxt, sax_handler);
 
+    xmlSetStructuredErrorFunc(NULL, NULL);
+
     rb_ensure(parse_doc, (VALUE)ctxt, parse_doc_finalize, (VALUE)ctxt);
 
     return Qnil;

data/ext/nokogiri/xml_sax_push_parser.c

@@ -35,6 +35,8 @@ static VALUE native_write(VALUE self, VALUE _chunk, VALUE _last_chunk)
     size = (int)RSTRING_LEN(_chunk);
   }
 
+  xmlSetStructuredErrorFunc(NULL, NULL);
+
   if (xmlParseChunk(ctx, chunk, size, Qtrue == _last_chunk ? 1 : 0)) {
     if (!(ctx->options & XML_PARSE_RECOVER)) {
       xmlErrorPtr e = xmlCtxtGetLastError(ctx);

data/ext/nokogiri/xml_syntax_error.c

@@ -1,5 +1,28 @@
 #include <xml_syntax_error.h>
 
+void
+Nokogiri_structured_error_func_save(libxmlStructuredErrorHandlerState *handler_state)
+{
+  /* this method is tightly coupled to the implementation of xmlSetStructuredErrorFunc */
+  handler_state->user_data = xmlStructuredErrorContext;
+  handler_state->handler = xmlStructuredError;
+}
+
+void
+Nokogiri_structured_error_func_save_and_set(libxmlStructuredErrorHandlerState *handler_state,
+                                            void *user_data,
+                                            xmlStructuredErrorFunc handler)
+{
+  Nokogiri_structured_error_func_save(handler_state);
+  xmlSetStructuredErrorFunc(user_data, handler);
+}
+
+void
+Nokogiri_structured_error_func_restore(libxmlStructuredErrorHandlerState *handler_state)
+{
+  xmlSetStructuredErrorFunc(handler_state->user_data, handler_state->handler);
+}
+
 void Nokogiri_error_array_pusher(void * ctx, xmlErrorPtr error)
 {
   VALUE list = (VALUE)ctx;

data/ext/nokogiri/xml_syntax_error.h

@@ -3,11 +3,23 @@
 
 #include <nokogiri.h>
 
+typedef struct _libxmlStructuredErrorHandlerState {
+  void *user_data;
+  xmlStructuredErrorFunc handler;
+} libxmlStructuredErrorHandlerState ;
+
 void init_xml_syntax_error();
+
+void Nokogiri_structured_error_func_save(libxmlStructuredErrorHandlerState *handler_state);
+void Nokogiri_structured_error_func_save_and_set(libxmlStructuredErrorHandlerState *handler_state,
+                                                 void *user_data,
+                                                 xmlStructuredErrorFunc handler);
+void Nokogiri_structured_error_func_restore(libxmlStructuredErrorHandlerState *handler_state);
+
 VALUE Nokogiri_wrap_xml_syntax_error(xmlErrorPtr error);
-void Nokogiri_error_array_pusher(void * ctx, xmlErrorPtr error);
-NORETURN(void Nokogiri_error_raise(void * ctx, xmlErrorPtr error));
+void Nokogiri_error_array_pusher(void *ctx, xmlErrorPtr error);
+NORETURN(void Nokogiri_error_raise(void *ctx, xmlErrorPtr error));
 
 extern VALUE cNokogiriXmlSyntaxError;
-#endif
 
+#endif /* NOKOGIRI_XML_SYNTAX_ERROR */

data/lib/nokogiri/version/constant.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = "1.11.0"
+  VERSION = "1.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.1
 platform: x86-linux
 authors:
 - Mike Dalessio
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-04 00:00:00.000000000 Z
+date: 2021-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: racc
@@ -165,14 +165,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.88'
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.88'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +237,7 @@ extra_rdoc_files:
 - ext/nokogiri/html_sax_push_parser.c
 - ext/nokogiri/xml_relax_ng.c
 - ext/nokogiri/xml_entity_decl.c
+- ext/nokogiri/test_global_handlers.c
 - ext/nokogiri/xml_node.c
 - ext/nokogiri/xml_entity_reference.c
 - ext/nokogiri/xslt_stylesheet.c
@@ -337,6 +338,7 @@ files:
 - ext/nokogiri/include/libxslt/xsltutils.h
 - ext/nokogiri/nokogiri.c
 - ext/nokogiri/nokogiri.h
+- ext/nokogiri/test_global_handlers.c
 - ext/nokogiri/xml_attr.c
 - ext/nokogiri/xml_attr.h
 - ext/nokogiri/xml_attribute_decl.c