Update XML::Builder to safely handle exceptions raised in blocks

Co-authored-by: Joana Tavares <jtavares@salsify.com>
ric2b · Nov 19, 2021 · f61dc0d · f61dc0d
1 parent 210ecbc
commit f61dc0d
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/lib/nokogiri/xml/builder.rb b/lib/nokogiri/xml/builder.rb
@@ -425,15 +425,18 @@ def method_missing(method, *args, &block) # :nodoc:
       def insert(node, &block)
         node = @parent.add_child(node)
         if block
-          old_parent = @parent
-          @parent = node
-          @arity ||= block.arity
-          if @arity <= 0
-            instance_eval(&block)
-          else
-            yield(self)
+          begin
+            old_parent = @parent
+            @parent = node
+            @arity ||= block.arity
+            if @arity <= 0
+              instance_eval(&block)
+            else
+              yield(self)
+            end
+          ensure
+            @parent = old_parent
           end
-          @parent = old_parent
         end
         NodeBuilder.new(node, self)
       end