(MRI) Fixed a memory leak in fragment parsing if nodes are not all su…

…bsequently reparented. Closes #856
sparklemotion · Mar 11, 2013 · 2c176f9 · 2c176f9
1 parent 5e04845
commit 2c176f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.ja.rdoc b/CHANGELOG.ja.rdoc
@@ -11,6 +11,8 @@
   * (JRuby) Adding an EntityReference after a Text node mangles the entity in JRuby. #835
   * (JRuby) JRuby version inconsistency: nil for empty attributes. #818
   * CSS queries for classes (e.g., ".foo") now treat all whitespace identically. #854
+  * (MRI) Fixed a memory leak in fragment parsing if nodes are not all subsequently reparented. #856
+
 
 == 1.5.6 / 2012年12月19日
 

diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -11,6 +11,7 @@
   * (JRuby) Adding an EntityReference after a Text node mangles the entity in JRuby. #835
   * (JRuby) JRuby version inconsistency: nil for empty attributes. #818
   * CSS queries for classes (e.g., ".foo") now treat all whitespace identically. #854
+  * (MRI) Fixed a memory leak in fragment parsing if nodes are not all subsequently reparented. #856
 
 
 == 1.5.6 / 2012-12-19

diff --git a/ext/nokogiri/xml_node.c b/ext/nokogiri/xml_node.c
@@ -1324,6 +1324,7 @@ static VALUE in_context(VALUE self, VALUE _str, VALUE _options)
 
     while (list) {
       xmlXPathNodeSetAddUnique(set, list);
+      if (list->parent == NULL) nokogiri_root_node(list); // always the case?
       list = list->next;
     }