moxml 0.5.124 → 0.5.126

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23e5ad1aa792190fa5588d08c6869fabfb6c7984ec4959d05d21add53ebf3ab3
-  data.tar.gz: a7bbc8695859d2b84b4e65e8abfe5a4922d52056be0d81a483cdd82be00f6c91
+  metadata.gz: 71f2ce65d604babc4d29753cb99b353f6f9fafa4a8379f913d109aa4e3cb1aba
+  data.tar.gz: bb11508d1a28d87de8b3bcca4a6913ce40d29ac7152dfbee4311db797873ea14
 SHA512:
-  metadata.gz: 6b970f9b7d6ecc4d64d19ce08d9d84ffa438bcafa93c48935ed35b91113513488fa4b7f64b263832e6b6e33317ae1b775c12706b50961f153f0cb909144f4c02
-  data.tar.gz: 57d5ac6080f8e5ad8a85511dfb22e4598c7d5c546c66f71c5f5493339f83f182add0f5da51164fb0ec6f25af94b0e1397de2711a234229c74c68afc23741de2b
+  metadata.gz: bca5457e68b0d51547a72f440097d5203fc469654f9360d6dfb6c3d0f8f8d8a6cf921e3e057e3bd9ef8c6ad86823c80057d5cb171474d27f4ca46e5de329a715
+  data.tar.gz: c382a8f7eb2e23a116021b47d785e6757e04961576b12f2f452c57d01e946ee121da96ff2b77e77c6d5539e49110dc5af32fcf0a4db208906d5852251ffa978e

data/Gemfile

@@ -9,7 +9,7 @@ gemspec
 gem "benchmark"
 gem "benchmark-ips"
 gem "get_process_mem"
-gem "leptris", "~> 1.9.338"
+gem "leptris", "~> 1.9.341"
 gem "libxml-ruby", ">= 5.0"
 gem "nokogiri", "~> 1.18"
 gem "openssl", "~> 3.0"

data/lib/moxml/element.rb

@@ -184,22 +184,55 @@ module Moxml
 
     # Nokogiri-compatible: children= replaces the entire child list
     def children=(node_or_nodes)
+      source_docs = nil
       natives = case node_or_nodes
                 when String
                   wrapper = "_moxml_children_#{Process.pid}_#{object_id}"
-                  context.parse("<#{wrapper}>#{node_or_nodes}</#{wrapper}>")
-                    .root.children.map(&:native)
-                when Moxml::Node then [node_or_nodes.native]
-                when Array, NodeSet then node_or_nodes.map(&:native)
+                  wrapper_doc = context.parse("<#{wrapper}>#{node_or_nodes}</#{wrapper}>")
+                  # #355: engines that move/copy across documents by
+                  # reference (leptris absorb) leave the attached
+                  # nodes pool-owned by the SOURCE document; the
+                  # wrapper is otherwise unreferenced and its free
+                  # can dangle the attached subtree (windows GC
+                  # timing). Retain it for this element's lifetime.
+                  source_docs = [wrapper_doc]
+                  wrapper_doc.root.children.map(&:native)
+                when Moxml::Node
+                  retain_children_source(node_or_nodes.document)
+                  [node_or_nodes.native]
+                when Array, NodeSet
+                  node_or_nodes.each { |n| retain_children_source(n.document) }
+                  node_or_nodes.map(&:native)
                 else
                   raise ArgumentError, "children= accepts String, Node, or Array"
                 end
       adapter.replace_children(@native, natives)
+      retain_children_source_docs(source_docs) if source_docs
       @text = nil
       context.bump_children_generation
       invalidate_children_cache!
     end
 
+    # #355: keep every distinct source document whose nodes were
+    # attached here reachable for as long as this element lives —
+    # absorbed/moved pools must not be freed out from under the
+    # tree. Accumulates: a pool absorbed by this document stays
+    # referenced even after later children= calls replace the
+    # nodes that came from it.
+    def retain_children_source(source_doc)
+      retain_children_source_docs([source_doc])
+    end
+
+    def retain_children_source_docs(docs)
+      docs = docs.compact.uniq
+      docs.delete_if { |d| d.equal?(document) }
+      return if docs.empty?
+
+      existing = adapter.attachments.get(@native, :children_source_docs)
+      merged = existing ? (existing + docs).uniq : docs
+      adapter.attachments.set(@native, :children_source_docs, merged)
+    end
+
     def remove_attribute(name)
       # Both remove paths end in invalidate_attribute_cache!, which
       # bumps the generation.

data/lib/moxml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Moxml
-  VERSION = "0.5.124"
+  VERSION = "0.5.126"
 end

data/spec/moxml/children_source_retention_spec.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# #355: children= attaches nodes whose engine storage may be
+# pool-owned by a SOURCE document (leptris absorbs/moves across
+# documents by reference). The String branch's wrapper document is
+# otherwise unreferenced — collected, its free can dangle the
+# attached subtree (windows GC timing, standoc#1272). The element
+# retains every distinct foreign source document for its lifetime.
+RSpec.describe "children= source retention (#355)" do
+  %i[leptris nokogiri].each do |adapter_name|
+    describe "on #{adapter_name}" do
+      let(:ctx) { Moxml.new(adapter_name) }
+
+      it "retains the String branch's wrapper document" do
+        el = ctx.parse("<bibitem><t>old</t></bibitem>").at("//bibitem")
+        el.children = "<contributor><role>author</role></contributor>"
+        sources = ctx.config.adapter.attachments.get(el.native, :children_source_docs)
+        expect(sources).not_to be_nil
+        expect(sources.size).to eq(1)
+        GC.start
+        expect(el.to_xml).to include("author")
+      end
+
+      it "retains cross-document sources from the Array branch" do
+        el = ctx.parse("<r/>").root
+        other = ctx.parse("<other><deep>v</deep></other>")
+        el.children = other.root.children.to_a
+        sources = ctx.config.adapter.attachments.get(el.native, :children_source_docs)
+        expect(sources).to eq([other])
+        GC.start
+        expect(el.to_xml).to include("deep")
+      end
+
+      it "accumulates distinct sources across repeated children= calls" do
+        el = ctx.parse("<r/>").root
+        other_a = ctx.parse("<a><x/></a>")
+        other_b = ctx.parse("<b><y/></b>")
+        el.children = other_a.root.children.to_a
+        el.children = other_b.root.children.to_a
+        sources = ctx.config.adapter.attachments.get(el.native, :children_source_docs)
+        expect(sources).to contain_exactly(other_a, other_b)
+      end
+
+      it "does not retain the element's own document" do
+        doc = ctx.parse("<r><x/></r>")
+        el = doc.root
+        el.children = el.children.to_a
+        expect(
+          ctx.config.adapter.attachments.get(el.native, :children_source_docs),
+        ).to be_nil
+      end
+    end
+  end
+end

data/spec/moxml/cycle_rejection_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+# Engine 1.9.339 (leptris#1640): reparenting a node into its own
+# descendant subtree is rejected (LEPTRIS_ERROR_INVALID_ARG) —
+# previously the edge built a parent cycle and the next serialize
+# recursed unbounded (the windows fast_element_xml segv family,
+# ASAN-reproduced). The moxml contract: the mutation RAISES and the
+# tree is untouched — never a corrupt-then-crash tree.
+RSpec.describe "cycle-creating reparents (engine 1.9.339+)" do
+  # Nokogiri raises but MOVES the argument (no tree-intact
+  # guarantee) — the untouched-tree contract is the engine's.
+  describe "on leptris" do
+    let(:ctx) { Moxml.new(:leptris) }
+
+    it "rejects appending an ancestor into its descendant" do
+      doc = ctx.parse("<r><a><b>x</b></a></r>")
+      a = doc.at("//a")
+      before = doc.to_xml
+      expect { a.add_child(doc.root) }.to raise_error(StandardError)
+      expect(doc.to_xml).to eq(before)
+    end
+
+    it "rejects the replace shape of the same cycle" do
+      doc = ctx.parse("<r><a><b><c/></b></a></r>")
+      b = doc.at("//b")
+      before = doc.to_xml
+      expect { b.add_child(doc.root) }.to raise_error(StandardError)
+      expect(doc.to_xml).to eq(before)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moxml
 version: !ruby/object:Gem::Version
-  version: 0.5.124
+  version: 0.5.126
 platform: ruby
 authors:
 - Ribose Inc.
@@ -483,9 +483,11 @@ files:
 - spec/moxml/c14n/w3c_examples_spec.rb
 - spec/moxml/c14n/xml_attributes_spec.rb
 - spec/moxml/cdata_spec.rb
+- spec/moxml/children_source_retention_spec.rb
 - spec/moxml/comment_spec.rb
 - spec/moxml/config_spec.rb
 - spec/moxml/context_spec.rb
+- spec/moxml/cycle_rejection_spec.rb
 - spec/moxml/declaration_preservation_spec.rb
 - spec/moxml/declaration_spec.rb
 - spec/moxml/doctype_spec.rb