nokogiri 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9cb90366d939c0faa58cf42e74ec4948e3ba422
-  data.tar.gz: 970ab46f73afddcca4a8ab4651723214f80b6e7b
+  metadata.gz: 5f5da7cc1a450e2f45a78d1d505dbb335f4e7d93
+  data.tar.gz: 9608185d33a04d96176a26d94acb4d06d4ed6c47
 SHA512:
-  metadata.gz: 527d7db935032c25b260a131d01bb3b2634ecd6a4edd144b57aa1d7185f54ca27deb7aa3aaccf077f4b291552307b9ec235e1beac1fd5909c365ac6389bb13d4
-  data.tar.gz: 28a130a618bd4bc2ce69cf9c050017d7e60ef922916624a5cdf588b4a962119381bb73327f1c65c52629b47027a5f481f7f1378414e3f18cdb7f65f37a8124d5
+  metadata.gz: 61749f45c042c9c983e01a578b3a26e7a91a915d92b53481d369da507d7199873694a9ae3638a9e2c628877df2c1694f83ca7a3e4b82f0e60360fc2da8db1979
+  data.tar.gz: 15818dd921a0f9ba125f447e366153e67e2ed67a309ec76870facbb4a4196061c139e2e1818797c385220cdc8a3bd714b564e31bacc535e31c7969c8f1d70d07

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.8.4 / 2018-07-03
+
+## Bug fixes
+
+* [MRI] Fix memory leak when creating nodes with namespaces. (Introduced in v1.5.7) [#1771]
+
+
 # 1.8.3 / 2018-06-16
 
 ## Security Notes

data/README.md

@@ -6,6 +6,8 @@ Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among
 Nokogiri's many features is the ability to search documents via XPath
 or CSS3 selectors.
 
+## Links
+
 * http://nokogiri.org
 * [Installation Help](http://nokogiri.org/tutorials/installing_nokogiri.html)
 * [Tutorials](http://nokogiri.org)

data/ext/nokogiri/xml_node.c

@@ -30,7 +30,6 @@ typedef xmlNodePtr (*pivot_reparentee_func)(xmlNodePtr, xmlNodePtr);
 /* :nodoc: */
 static void relink_namespace(xmlNodePtr reparented)
 {
-  xmlChar *name, *prefix;
   xmlNodePtr child;
   xmlNsPtr ns;
 
@@ -38,10 +37,16 @@ static void relink_namespace(xmlNodePtr reparented)
       reparented->type != XML_ELEMENT_NODE) { return; }
 
   if (reparented->ns == NULL || reparented->ns->prefix == NULL) {
+    xmlChar *name = 0, *prefix = 0;
+
     name = xmlSplitQName2(reparented->name, &prefix);
 
-    if(reparented->type == XML_ATTRIBUTE_NODE) {
-      if (prefix == NULL || strcmp((char*)prefix, XMLNS_PREFIX) == 0) { return; }
+    if (reparented->type == XML_ATTRIBUTE_NODE) {
+      if (prefix == NULL || strcmp((char*)prefix, XMLNS_PREFIX) == 0) {
+        xmlFree(name);
+        xmlFree(prefix);
+        return;
+      }
     }
 
     ns = xmlSearchNs(reparented->doc, reparented, prefix);
@@ -54,6 +59,9 @@ static void relink_namespace(xmlNodePtr reparented)
       xmlNodeSetName(reparented, name);
       xmlSetNs(reparented, ns);
     }
+
+    xmlFree(name);
+    xmlFree(prefix);
   }
 
   /* Avoid segv when relinking against unlinked nodes. */
@@ -71,10 +79,10 @@ static void relink_namespace(xmlNodePtr reparented)
 
     while (curr) {
       xmlNsPtr ns = xmlSearchNsByHref(
-          reparented->doc,
-          reparented->parent,
-          curr->href
-      );
+                      reparented->doc,
+                      reparented->parent,
+                      curr->href
+                    );
       /* If we find the namespace is already declared, remove it from this
        * definition list. */
       if (ns && ns != curr && xmlStrEqual(ns->prefix, curr->prefix)) {
@@ -143,10 +151,12 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
   xmlNodePtr reparentee, pivot, reparented, next_text, new_next_text, parent ;
   int original_ns_prefix_is_default = 0 ;
 
-  if(!rb_obj_is_kind_of(reparentee_obj, cNokogiriXmlNode))
+  if(!rb_obj_is_kind_of(reparentee_obj, cNokogiriXmlNode)) {
     rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node");
-  if(rb_obj_is_kind_of(reparentee_obj, cNokogiriXmlDocument))
+  }
+  if(rb_obj_is_kind_of(reparentee_obj, cNokogiriXmlDocument)) {
     rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node");
+  }
 
   Data_Get_Struct(reparentee_obj, xmlNode, reparentee);
   Data_Get_Struct(pivot_obj, xmlNode, pivot);
@@ -172,10 +182,10 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
       case XML_PI_NODE:
       case XML_COMMENT_NODE:
       case XML_DOCUMENT_TYPE_NODE:
-        /*
-         * The DOM specification says no to adding text-like nodes
-         * directly to a document, but we allow it for compatibility.
-         */
+      /*
+       * The DOM specification says no to adding text-like nodes
+       * directly to a document, but we allow it for compatibility.
+       */
       case XML_TEXT_NODE:
       case XML_CDATA_SECTION_NODE:
       case XML_ENTITY_REF_NODE:
@@ -368,9 +378,9 @@ static VALUE encode_special_chars(VALUE self, VALUE string)
 
   Data_Get_Struct(self, xmlNode, node);
   encoded = xmlEncodeSpecialChars(
-      node->doc,
-      (const xmlChar *)StringValueCStr(string)
-  );
+              node->doc,
+              (const xmlChar *)StringValueCStr(string)
+            );
 
   encoded_str = NOKOGIRI_STR_NEW2(encoded);
   xmlFree(encoded);
@@ -400,17 +410,18 @@ static VALUE create_internal_subset(VALUE self, VALUE name, VALUE external_id, V
 
   doc = node->doc;
 
-  if(xmlGetIntSubset(doc))
+  if(xmlGetIntSubset(doc)) {
     rb_raise(rb_eRuntimeError, "Document already has an internal subset");
+  }
 
   dtd = xmlCreateIntSubset(
-      doc,
-      NIL_P(name)        ? NULL : (const xmlChar *)StringValueCStr(name),
-      NIL_P(external_id) ? NULL : (const xmlChar *)StringValueCStr(external_id),
-      NIL_P(system_id)   ? NULL : (const xmlChar *)StringValueCStr(system_id)
-  );
+          doc,
+          NIL_P(name)        ? NULL : (const xmlChar *)StringValueCStr(name),
+          NIL_P(external_id) ? NULL : (const xmlChar *)StringValueCStr(external_id),
+          NIL_P(system_id)   ? NULL : (const xmlChar *)StringValueCStr(system_id)
+        );
 
-  if(!dtd) return Qnil;
+  if(!dtd) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)dtd);
 }
@@ -431,17 +442,18 @@ static VALUE create_external_subset(VALUE self, VALUE name, VALUE external_id, V
 
   doc = node->doc;
 
-  if(doc->extSubset)
+  if(doc->extSubset) {
     rb_raise(rb_eRuntimeError, "Document already has an external subset");
+  }
 
   dtd = xmlNewDtd(
-      doc,
-      NIL_P(name)        ? NULL : (const xmlChar *)StringValueCStr(name),
-      NIL_P(external_id) ? NULL : (const xmlChar *)StringValueCStr(external_id),
-      NIL_P(system_id)   ? NULL : (const xmlChar *)StringValueCStr(system_id)
-  );
+          doc,
+          NIL_P(name)        ? NULL : (const xmlChar *)StringValueCStr(name),
+          NIL_P(external_id) ? NULL : (const xmlChar *)StringValueCStr(external_id),
+          NIL_P(system_id)   ? NULL : (const xmlChar *)StringValueCStr(system_id)
+        );
 
-  if(!dtd) return Qnil;
+  if(!dtd) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)dtd);
 }
@@ -460,12 +472,12 @@ static VALUE external_subset(VALUE self)
 
   Data_Get_Struct(self, xmlNode, node);
 
-  if(!node->doc) return Qnil;
+  if(!node->doc) { return Qnil; }
 
   doc = node->doc;
   dtd = doc->extSubset;
 
-  if(!dtd) return Qnil;
+  if(!dtd) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)dtd);
 }
@@ -484,12 +496,12 @@ static VALUE internal_subset(VALUE self)
 
   Data_Get_Struct(self, xmlNode, node);
 
-  if(!node->doc) return Qnil;
+  if(!node->doc) { return Qnil; }
 
   doc = node->doc;
   dtd = xmlGetIntSubset(doc);
 
-  if(!dtd) return Qnil;
+  if(!dtd) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)dtd);
 }
@@ -506,13 +518,14 @@ static VALUE duplicate_node(int argc, VALUE *argv, VALUE self)
   VALUE level;
   xmlNodePtr node, dup;
 
-  if(rb_scan_args(argc, argv, "01", &level) == 0)
+  if(rb_scan_args(argc, argv, "01", &level) == 0) {
     level = INT2NUM((long)1);
+  }
 
   Data_Get_Struct(self, xmlNode, node);
 
   dup = xmlDocCopyNode(node, node->doc, (int)NUM2INT(level));
-  if(dup == NULL) return Qnil;
+  if(dup == NULL) { return Qnil; }
 
   nokogiri_root_node(dup);
 
@@ -559,7 +572,7 @@ static VALUE next_sibling(VALUE self)
   Data_Get_Struct(self, xmlNode, node);
 
   sibling = node->next;
-  if(!sibling) return Qnil;
+  if(!sibling) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, sibling) ;
 }
@@ -576,7 +589,7 @@ static VALUE previous_sibling(VALUE self)
   Data_Get_Struct(self, xmlNode, node);
 
   sibling = node->prev;
-  if(!sibling) return Qnil;
+  if(!sibling) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, sibling);
 }
@@ -593,7 +606,7 @@ static VALUE next_element(VALUE self)
   Data_Get_Struct(self, xmlNode, node);
 
   sibling = xmlNextElementSibling(node);
-  if(!sibling) return Qnil;
+  if(!sibling) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, sibling);
 }
@@ -613,10 +626,11 @@ static VALUE previous_element(VALUE self)
    *  note that we don't use xmlPreviousElementSibling here because it's buggy pre-2.7.7.
    */
   sibling = node->prev;
-  if(!sibling) return Qnil;
+  if(!sibling) { return Qnil; }
 
-  while(sibling && sibling->type != XML_ELEMENT_NODE)
+  while(sibling && sibling->type != XML_ELEMENT_NODE) {
     sibling = sibling->prev;
+  }
 
   return sibling ? Nokogiri_wrap_xml_node(Qnil, sibling) : Qnil ;
 }
@@ -624,13 +638,13 @@ static VALUE previous_element(VALUE self)
 /* :nodoc: */
 static VALUE replace(VALUE self, VALUE new_node)
 {
-    VALUE reparent = reparent_node_with(self, new_node, xmlReplaceNodeWrapper);
+  VALUE reparent = reparent_node_with(self, new_node, xmlReplaceNodeWrapper);
 
-    xmlNodePtr pivot;
-    Data_Get_Struct(self, xmlNode, pivot);
-    nokogiri_root_node(pivot);
+  xmlNodePtr pivot;
+  Data_Get_Struct(self, xmlNode, pivot);
+  nokogiri_root_node(pivot);
 
-    return reparent;
+  return reparent;
 }
 
 /*
@@ -654,7 +668,7 @@ static VALUE children(VALUE self)
 
   document = DOC_RUBY_OBJECT(node->doc);
 
-  if(!child) return Nokogiri_wrap_xml_node_set(set, document);
+  if(!child) { return Nokogiri_wrap_xml_node_set(set, document); }
 
   child = child->next;
   while(NULL != child) {
@@ -693,7 +707,7 @@ static VALUE element_children(VALUE self)
 
   document = DOC_RUBY_OBJECT(node->doc);
 
-  if(!child) return Nokogiri_wrap_xml_node_set(set, document);
+  if(!child) { return Nokogiri_wrap_xml_node_set(set, document); }
 
   child = xmlNextElementSibling(child);
   while(NULL != child) {
@@ -718,7 +732,7 @@ static VALUE child(VALUE self)
   Data_Get_Struct(self, xmlNode, node);
 
   child = node->children;
-  if(!child) return Qnil;
+  if(!child) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, child);
 }
@@ -739,7 +753,7 @@ static VALUE first_element_child(VALUE self)
   Data_Get_Struct(self, xmlNode, node);
 
   child = xmlFirstElementChild(node);
-  if(!child) return Qnil;
+  if(!child) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, child);
 }
@@ -760,7 +774,7 @@ static VALUE last_element_child(VALUE self)
   Data_Get_Struct(self, xmlNode, node);
 
   child = xmlLastElementChild(node);
-  if(!child) return Qnil;
+  if(!child) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, child);
 }
@@ -775,8 +789,9 @@ static VALUE key_eh(VALUE self, VALUE attribute)
 {
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
-  if(xmlHasProp(node, (xmlChar *)StringValueCStr(attribute)))
+  if(xmlHasProp(node, (xmlChar *)StringValueCStr(attribute))) {
     return Qtrue;
+  }
   return Qfalse;
 }
 
@@ -791,8 +806,9 @@ static VALUE namespaced_key_eh(VALUE self, VALUE attribute, VALUE namespace)
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
   if(xmlHasNsProp(node, (xmlChar *)StringValueCStr(attribute),
-        NIL_P(namespace) ? NULL : (xmlChar *)StringValueCStr(namespace)))
+                  NIL_P(namespace) ? NULL : (xmlChar *)StringValueCStr(namespace))) {
     return Qtrue;
+  }
   return Qfalse;
 }
 
@@ -814,8 +830,9 @@ static VALUE set(VALUE self, VALUE property, VALUE value)
    *
    * We can avoid this by unlinking these nodes first.
    */
-  if (node->type != XML_ELEMENT_NODE)
+  if (node->type != XML_ELEMENT_NODE) {
     return(Qnil);
+  }
   prop = xmlHasProp(node, (xmlChar *)StringValueCStr(property));
   if (prop && prop->children) {
     for (cur = prop->children; cur; cur = cur->next) {
@@ -827,7 +844,7 @@ static VALUE set(VALUE self, VALUE property, VALUE value)
   }
 
   xmlSetProp(node, (xmlChar *)StringValueCStr(property),
-      (xmlChar *)StringValueCStr(value));
+             (xmlChar *)StringValueCStr(value));
 
   return value;
 }
@@ -847,7 +864,7 @@ static VALUE get(VALUE self, VALUE rattribute)
   xmlChar *attribute, *attr_name, *prefix;
   xmlNsPtr ns;
 
-  if (NIL_P(rattribute)) return Qnil;
+  if (NIL_P(rattribute)) { return Qnil; }
 
   Data_Get_Struct(self, xmlNode, node);
   attribute = xmlCharStrdup(StringValueCStr(rattribute));
@@ -871,7 +888,7 @@ static VALUE get(VALUE self, VALUE rattribute)
   }
 
   xmlFree((void *)attribute);
-  if (!value) return Qnil;
+  if (!value) { return Qnil; }
 
   rvalue = NOKOGIRI_STR_NEW2(value);
   xmlFree((void *)value);
@@ -892,8 +909,9 @@ static VALUE set_namespace(VALUE self, VALUE namespace)
 
   Data_Get_Struct(self, xmlNode, node);
 
-  if(!NIL_P(namespace))
+  if(!NIL_P(namespace)) {
     Data_Get_Struct(namespace, xmlNs, ns);
+  }
 
   xmlSetNs(node, ns);
 
@@ -913,7 +931,7 @@ static VALUE attr(VALUE self, VALUE name)
   Data_Get_Struct(self, xmlNode, node);
   prop = xmlHasProp(node, (xmlChar *)StringValueCStr(name));
 
-  if(! prop) return Qnil;
+  if(! prop) { return Qnil; }
   return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)prop);
 }
 
@@ -929,9 +947,9 @@ static VALUE attribute_with_ns(VALUE self, VALUE name, VALUE namespace)
   xmlAttrPtr prop;
   Data_Get_Struct(self, xmlNode, node);
   prop = xmlHasNsProp(node, (xmlChar *)StringValueCStr(name),
-      NIL_P(namespace) ? NULL : (xmlChar *)StringValueCStr(namespace));
+                      NIL_P(namespace) ? NULL : (xmlChar *)StringValueCStr(namespace));
 
-  if(! prop) return Qnil;
+  if(! prop) { return Qnil; }
   return Nokogiri_wrap_xml_node(Qnil, (xmlNodePtr)prop);
 }
 
@@ -943,16 +961,16 @@ static VALUE attribute_with_ns(VALUE self, VALUE name, VALUE namespace)
  */
 static VALUE attribute_nodes(VALUE self)
 {
-    /* this code in the mode of xmlHasProp() */
-    xmlNodePtr node;
-    VALUE attr;
+  /* this code in the mode of xmlHasProp() */
+  xmlNodePtr node;
+  VALUE attr;
 
-    Data_Get_Struct(self, xmlNode, node);
+  Data_Get_Struct(self, xmlNode, node);
 
-    attr = rb_ary_new();
-    Nokogiri_xml_node_properties(node, attr);
+  attr = rb_ary_new();
+  Nokogiri_xml_node_properties(node, attr);
 
-    return attr ;
+  return attr ;
 }
 
 
@@ -965,13 +983,14 @@ static VALUE attribute_nodes(VALUE self)
  */
 static VALUE namespace(VALUE self)
 {
-  xmlNodePtr node ;
-  Data_Get_Struct(self, xmlNode, node);
+xmlNodePtr node ;
+Data_Get_Struct(self, xmlNode, node);
 
-  if (node->ns)
-    return Nokogiri_wrap_xml_namespace(node->doc, node->ns);
+if (node->ns) {
+  return Nokogiri_wrap_xml_namespace(node->doc, node->ns);
+}
 
-  return Qnil ;
+return Qnil ;
 }
 
 /*
@@ -993,7 +1012,7 @@ static VALUE namespace_definitions(VALUE self)
 
   ns = node->nsDef;
 
-  if(!ns) return list;
+  if(!ns) { return list; }
 
   while(NULL != ns) {
     rb_ary_push(list, Nokogiri_wrap_xml_namespace(node->doc, ns));
@@ -1024,7 +1043,7 @@ static VALUE namespace_scopes(VALUE self)
   list = rb_ary_new();
   ns_list = xmlGetNsList(node->doc, node);
 
-  if(!ns_list) return list;
+  if(!ns_list) { return list; }
 
   for (j = 0 ; ns_list[j] != NULL ; ++j) {
     rb_ary_push(list, Nokogiri_wrap_xml_namespace(node->doc, ns_list[j]));
@@ -1154,7 +1173,7 @@ static VALUE get_parent(VALUE self)
   Data_Get_Struct(self, xmlNode, node);
 
   parent = node->parent;
-  if(!parent) return Qnil;
+  if(!parent) { return Qnil; }
 
   return Nokogiri_wrap_xml_node(Qnil, parent) ;
 }
@@ -1183,8 +1202,9 @@ static VALUE get_name(VALUE self)
 {
   xmlNodePtr node;
   Data_Get_Struct(self, xmlNode, node);
-  if(node->name)
+  if(node->name) {
     return NOKOGIRI_STR_NEW2(node->name);
+  }
   return Qnil;
 }
 
@@ -1227,12 +1247,13 @@ static VALUE add_previous_sibling(VALUE self, VALUE new_sibling)
  * Write this Node to +io+ with +encoding+ and +options+
  */
 static VALUE native_write_to(
-    VALUE self,
-    VALUE io,
-    VALUE encoding,
-    VALUE indent_string,
-    VALUE options
-) {
+  VALUE self,
+  VALUE io,
+  VALUE encoding,
+  VALUE indent_string,
+  VALUE options
+)
+{
   xmlNodePtr node;
   const char * before_indent;
   xmlSaveCtxtPtr savectx;
@@ -1246,12 +1267,12 @@ static VALUE native_write_to(
   xmlTreeIndentString = StringValueCStr(indent_string);
 
   savectx = xmlSaveToIO(
-      (xmlOutputWriteCallback)io_write_callback,
-      (xmlOutputCloseCallback)io_close_callback,
-      (void *)io,
-      RTEST(encoding) ? StringValueCStr(encoding) : NULL,
-      (int)NUM2INT(options)
-  );
+              (xmlOutputWriteCallback)io_write_callback,
+              (xmlOutputCloseCallback)io_close_callback,
+              (void *)io,
+              RTEST(encoding) ? StringValueCStr(encoding) : NULL,
+              (int)NUM2INT(options)
+            );
 
   xmlSaveTree(savectx, node);
   xmlSaveClose(savectx);
@@ -1294,25 +1315,25 @@ static VALUE add_namespace_definition(VALUE self, VALUE prefix, VALUE href)
   namespacee = node ;
 
   ns = xmlSearchNs(
-      node->doc,
-      node,
-      (const xmlChar *)(NIL_P(prefix) ? NULL : StringValueCStr(prefix))
-  );
+         node->doc,
+         node,
+         (const xmlChar *)(NIL_P(prefix) ? NULL : StringValueCStr(prefix))
+       );
 
   if(!ns) {
     if (node->type != XML_ELEMENT_NODE) {
       namespacee = node->parent;
     }
     ns = xmlNewNs(
-        namespacee,
-        (const xmlChar *)StringValueCStr(href),
-        (const xmlChar *)(NIL_P(prefix) ? NULL : StringValueCStr(prefix))
-    );
+           namespacee,
+           (const xmlChar *)StringValueCStr(href),
+           (const xmlChar *)(NIL_P(prefix) ? NULL : StringValueCStr(prefix))
+         );
   }
 
-  if (!ns) return Qnil ;
+  if (!ns) { return Qnil ; }
 
-  if(NIL_P(prefix) || node != namespacee) xmlSetNs(node, ns);
+  if(NIL_P(prefix) || node != namespacee) { xmlSetNs(node, ns); }
 
   return Nokogiri_wrap_xml_namespace(node->doc, ns);
 }
@@ -1341,12 +1362,12 @@ static VALUE new(int argc, VALUE *argv, VALUE klass)
   nokogiri_root_node(node);
 
   rb_node = Nokogiri_wrap_xml_node(
-      klass == cNokogiriXmlNode ? (VALUE)NULL : klass,
-      node
-  );
+              klass == cNokogiriXmlNode ? (VALUE)NULL : klass,
+              node
+            );
   rb_obj_call_init(rb_node, argc, argv);
 
-  if(rb_block_given_p()) rb_yield(rb_node);
+  if(rb_block_given_p()) { rb_yield(rb_node); }
 
   return rb_node;
 }
@@ -1411,10 +1432,11 @@ static VALUE process_xincludes(VALUE self, VALUE options)
     xmlErrorPtr error;
 
     error = xmlGetLastError();
-    if(error)
+    if(error) {
       rb_exc_raise(Nokogiri_wrap_xml_syntax_error(error));
-    else
+    } else {
       rb_raise(rb_eRuntimeError, "Could not perform xinclude substitution");
+    }
   }
 
   return self;
@@ -1424,101 +1446,104 @@ static VALUE process_xincludes(VALUE self, VALUE options)
 /* TODO: DOCUMENT ME */
 static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
 {
-    xmlNodePtr node, list = 0, tmp, child_iter, node_children, doc_children;
-    xmlNodeSetPtr set;
-    xmlParserErrors error;
-    VALUE doc, err;
-    int doc_is_empty;
+  xmlNodePtr node, list = 0, tmp, child_iter, node_children, doc_children;
+  xmlNodeSetPtr set;
+  xmlParserErrors error;
+  VALUE doc, err;
+  int doc_is_empty;
 
-    Data_Get_Struct(self, xmlNode, node);
+  Data_Get_Struct(self, xmlNode, node);
 
-    doc = DOC_RUBY_OBJECT(node->doc);
-    err = rb_iv_get(doc, "@errors");
-    doc_is_empty = (node->doc->children == NULL) ? 1 : 0;
-    node_children = node->children;
-    doc_children  = node->doc->children;
+  doc = DOC_RUBY_OBJECT(node->doc);
+  err = rb_iv_get(doc, "@errors");
+  doc_is_empty = (node->doc->children == NULL) ? 1 : 0;
+  node_children = node->children;
+  doc_children  = node->doc->children;
 
-    xmlSetStructuredErrorFunc((void *)err, Nokogiri_error_array_pusher);
+  xmlSetStructuredErrorFunc((void *)err, Nokogiri_error_array_pusher);
 
-    /* Twiddle global variable because of a bug in libxml2.
-     * http://git.gnome.org/browse/libxml2/commit/?id=e20fb5a72c83cbfc8e4a8aa3943c6be8febadab7
-     */
+  /* Twiddle global variable because of a bug in libxml2.
+   * http://git.gnome.org/browse/libxml2/commit/?id=e20fb5a72c83cbfc8e4a8aa3943c6be8febadab7
+   */
 #ifndef HTML_PARSE_NOIMPLIED
-    htmlHandleOmittedElem(0);
+  htmlHandleOmittedElem(0);
 #endif
 
-    /* This function adds a fake node to the child of +node+.  If the parser
-     * does not exit cleanly with XML_ERR_OK, the list is freed.  This can
-     * leave the child pointers in a bad state if they were originally empty.
-     *
-     * http://git.gnome.org/browse/libxml2/tree/parser.c#n13177
-     * */
-    error = xmlParseInNodeContext(node, StringValuePtr(_str),
-				  (int)RSTRING_LEN(_str),
-				  (int)NUM2INT(_options), &list);
-
-    /* xmlParseInNodeContext should not mutate the original document or node,
-     * so reassigning these pointers should be OK.  The reason we're reassigning
-     * is because if there were errors, it's possible for the child pointers
-     * to be manipulated. */
-    if (error != XML_ERR_OK) {
-      node->doc->children = doc_children;
-      node->children = node_children;
-    }
+  /* This function adds a fake node to the child of +node+.  If the parser
+   * does not exit cleanly with XML_ERR_OK, the list is freed.  This can
+   * leave the child pointers in a bad state if they were originally empty.
+   *
+   * http://git.gnome.org/browse/libxml2/tree/parser.c#n13177
+   * */
+  error = xmlParseInNodeContext(node, StringValuePtr(_str),
+                                (int)RSTRING_LEN(_str),
+                                (int)NUM2INT(_options), &list);
+
+  /* xmlParseInNodeContext should not mutate the original document or node,
+   * so reassigning these pointers should be OK.  The reason we're reassigning
+   * is because if there were errors, it's possible for the child pointers
+   * to be manipulated. */
+  if (error != XML_ERR_OK) {
+    node->doc->children = doc_children;
+    node->children = node_children;
+  }
 
-    /* make sure parent/child pointers are coherent so an unlink will work
-     * properly (#331)
-     */
-    child_iter = node->doc->children ;
-    while (child_iter) {
-      if (child_iter->parent != (xmlNodePtr)node->doc)
-        child_iter->parent = (xmlNodePtr)node->doc;
-      child_iter = child_iter->next;
+  /* make sure parent/child pointers are coherent so an unlink will work
+   * properly (#331)
+   */
+  child_iter = node->doc->children ;
+  while (child_iter) {
+    if (child_iter->parent != (xmlNodePtr)node->doc) {
+      child_iter->parent = (xmlNodePtr)node->doc;
     }
+    child_iter = child_iter->next;
+  }
 
 #ifndef HTML_PARSE_NOIMPLIED
-    htmlHandleOmittedElem(1);
+  htmlHandleOmittedElem(1);
 #endif
 
-    xmlSetStructuredErrorFunc(NULL, NULL);
-
-    /* Workaround for a libxml2 bug where a parsing error may leave a broken
-     * node reference in node->doc->children.
-     * This workaround is limited to when a parse error occurs, the document
-     * went from having no children to having children, and the context node is
-     * part of a document fragment.
-     * https://bugzilla.gnome.org/show_bug.cgi?id=668155
-     */
-    if (error != XML_ERR_OK && doc_is_empty && node->doc->children != NULL) {
-      child_iter = node;
-      while (child_iter->parent)
-        child_iter = child_iter->parent;
+  xmlSetStructuredErrorFunc(NULL, NULL);
 
-      if (child_iter->type == XML_DOCUMENT_FRAG_NODE)
-        node->doc->children = NULL;
+  /* Workaround for a libxml2 bug where a parsing error may leave a broken
+   * node reference in node->doc->children.
+   * This workaround is limited to when a parse error occurs, the document
+   * went from having no children to having children, and the context node is
+   * part of a document fragment.
+   * https://bugzilla.gnome.org/show_bug.cgi?id=668155
+   */
+  if (error != XML_ERR_OK && doc_is_empty && node->doc->children != NULL) {
+    child_iter = node;
+    while (child_iter->parent) {
+      child_iter = child_iter->parent;
     }
 
-    /* FIXME: This probably needs to handle more constants... */
-    switch (error) {
-      case XML_ERR_INTERNAL_ERROR:
-      case XML_ERR_NO_MEMORY:
-	rb_raise(rb_eRuntimeError, "error parsing fragment (%d)", error);
-	break;
-      default:
-	break;
+    if (child_iter->type == XML_DOCUMENT_FRAG_NODE) {
+      node->doc->children = NULL;
     }
+  }
 
-    set = xmlXPathNodeSetCreate(NULL);
+  /* FIXME: This probably needs to handle more constants... */
+  switch (error) {
+  case XML_ERR_INTERNAL_ERROR:
+  case XML_ERR_NO_MEMORY:
+    rb_raise(rb_eRuntimeError, "error parsing fragment (%d)", error);
+    break;
+  default:
+    break;
+  }
 
-    while (list) {
-      tmp = list->next;
-      list->next = NULL;
-      xmlXPathNodeSetAddUnique(set, list);
-      nokogiri_root_node(list);
-      list = tmp;
-    }
+  set = xmlXPathNodeSetCreate(NULL);
+
+  while (list) {
+    tmp = list->next;
+    list->next = NULL;
+    xmlXPathNodeSetAddUnique(set, list);
+    nokogiri_root_node(list);
+    list = tmp;
+  }
 
-    return Nokogiri_wrap_xml_node_set(set, doc);
+  return Nokogiri_wrap_xml_node_set(set, doc);
 }
 
 
@@ -1533,22 +1558,23 @@ VALUE Nokogiri_wrap_xml_node(VALUE klass, xmlNodePtr node)
 
   assert(node);
 
-  if(node->type == XML_DOCUMENT_NODE || node->type == XML_HTML_DOCUMENT_NODE)
-      return DOC_RUBY_OBJECT(node->doc);
+  if(node->type == XML_DOCUMENT_NODE || node->type == XML_HTML_DOCUMENT_NODE) {
+    return DOC_RUBY_OBJECT(node->doc);
+  }
 
   /* It's OK if the node doesn't have a fully-realized document (as in XML::Reader). */
   /* see https://github.com/sparklemotion/nokogiri/issues/95 */
   /* and https://github.com/sparklemotion/nokogiri/issues/439 */
   doc = node->doc;
-  if (doc->type == XML_DOCUMENT_FRAG_NODE) doc = doc->doc;
+  if (doc->type == XML_DOCUMENT_FRAG_NODE) { doc = doc->doc; }
   node_has_a_document = DOC_RUBY_OBJECT_TEST(doc);
 
-  if(node->_private && node_has_a_document)
+  if(node->_private && node_has_a_document) {
     return (VALUE)node->_private;
+  }
 
   if(!RTEST(klass)) {
-    switch(node->type)
-    {
+    switch(node->type) {
     case XML_ELEMENT_NODE:
       klass = cNokogiriXmlElement;
       break;

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.8.3'
+  VERSION = '1.8.4'
 
   class VersionInfo # :nodoc:
     def jruby?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Aaron Patterson
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2018-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -216,19 +216,6 @@ description: |-
   Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among
   Nokogiri's many features is the ability to search documents via XPath
   or CSS3 selectors.
-
-  * http://nokogiri.org
-  * [Installation Help](http://nokogiri.org/tutorials/installing_nokogiri.html)
-  * [Tutorials](http://nokogiri.org)
-  * [GitHub](https://github.com/sparklemotion/nokogiri)
-  * [Mailing List](https://groups.google.com/group/nokogiri-talk)
-  * [Bug Reports](https://github.com/sparklemotion/nokogiri/issues)
-  * [Chat/Gitter](https://gitter.im/sparklemotion/nokogiri)
-
-  [![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/nokogiri/jobs/ruby-2.4-system/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/nokogiri?groups=master)
-  [![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri)
-  [![Version Eye](https://www.versioneye.com/ruby/nokogiri/badge.png)](https://www.versioneye.com/ruby/nokogiri)
-  [![Join the chat at https://gitter.im/sparklemotion/nokogiri](https://badges.gitter.im/sparklemotion/nokogiri.svg)](https://gitter.im/sparklemotion/nokogiri?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 email:
 - aaronp@rubyforge.org
 - mike.dalessio@gmail.com