Merge branch 'master' into rwstauner/dw_form_ref_addr

Author: luke-gruber

NEWS.md

@@ -119,7 +119,7 @@ releases.
   * 4.0.3 to [v4.0.4][RubyGems-v4.0.4], [v4.0.5][RubyGems-v4.0.5], [v4.0.6][RubyGems-v4.0.6], [v4.0.7][RubyGems-v4.0.7], [v4.0.8][RubyGems-v4.0.8], [v4.0.9][RubyGems-v4.0.9], [v4.0.10][RubyGems-v4.0.10], [v4.0.11][RubyGems-v4.0.11], [v4.0.12][RubyGems-v4.0.12], [v4.0.13][RubyGems-v4.0.13], [v4.0.14][RubyGems-v4.0.14], [v4.0.15][RubyGems-v4.0.15], [v4.0.16][RubyGems-v4.0.16]
 * bundler 4.1.0.dev
   * 4.0.3 to [v4.0.4][bundler-v4.0.4], [v4.0.5][bundler-v4.0.5], [v4.0.6][bundler-v4.0.6], [v4.0.7][bundler-v4.0.7], [v4.0.8][bundler-v4.0.8], [v4.0.9][bundler-v4.0.9], [v4.0.10][bundler-v4.0.10], [v4.0.11][bundler-v4.0.11], [v4.0.12][bundler-v4.0.12], [v4.0.13][bundler-v4.0.13], [v4.0.14][bundler-v4.0.14], [v4.0.15][bundler-v4.0.15], [v4.0.16][bundler-v4.0.16]
-* erb 6.0.4
+* erb 6.0.5
   * 6.0.1 to [v6.0.1.1][erb-v6.0.1.1], [v6.0.2][erb-v6.0.2], [v6.0.3][erb-v6.0.3], [v6.0.4][erb-v6.0.4]
 * error_highlight 0.7.2
 * ipaddr 1.2.9

lib/erb.rb

@@ -778,6 +778,9 @@
 # [template processor]: https://en.wikipedia.org/wiki/Template_processor
 #
 class ERB
+  IDENTITY_METHOD = BasicObject.instance_method(:equal?) # :nodoc:
+  private_constant :IDENTITY_METHOD
+
   # :markup: markdown
   #
   # :call-seq:
@@ -1007,7 +1010,7 @@ def run(b=new_toplevel)
   # [local binding]: rdoc-ref:ERB@Local+Binding
   #
   def result(b=new_toplevel)
-    unless @_init.equal?(self.class.singleton_class)
+    unless initialized_by_new?
       raise ArgumentError, "not initialized"
     end
     eval(@src, b, (@filename || '(erb)'), @lineno)
@@ -1061,6 +1064,11 @@ def new_toplevel(vars = nil)
   end
   private :new_toplevel
 
+  def initialized_by_new? # :nodoc:
+    IDENTITY_METHOD.bind_call(@_init, self.class.singleton_class)
+  end
+  private :initialized_by_new?
+
   # :markup: markdown
   #
   # :call-seq:
@@ -1087,7 +1095,7 @@ def new_toplevel(vars = nil)
   # ```
   #
   def def_method(mod, methodname, fname='(ERB)')
-    unless @_init.equal?(self.class.singleton_class)
+    unless initialized_by_new?
       raise ArgumentError, "not initialized"
     end
     src = self.src.sub(/^(?!#|$)/) {"def #{methodname}\n"} << "\nend\n"

lib/erb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 class ERB
   # The string \ERB version.
-  VERSION = '6.0.4'
+  VERSION = '6.0.5'
 end

test/erb/test_erb.rb

@@ -85,10 +85,24 @@ def test_concurrent_default_binding
 end
 
 class TestERBCore < Test::Unit::TestCase
+  class AlwaysEqual
+    def equal?(_other)
+      true
+    end
+  end
+
   def setup
     @erb = ERB
   end
 
+  def marshal_loaded_erb(init, src: "")
+    erb = ERB.allocate
+    erb.instance_variable_set(:@src, src)
+    erb.instance_variable_set(:@lineno, 1)
+    erb.instance_variable_set(:@_init, init)
+    Marshal.load(Marshal.dump(erb))
+  end
+
   def test_version
     assert_equal(String, @erb.version.class)
   end
@@ -664,6 +678,11 @@ def test_prohibited_marshal_load
     assert_raise(ArgumentError) {erb.result}
   end
 
+  def test_prohibited_marshal_load_result_with_overridden_equal
+    erb = marshal_loaded_erb(AlwaysEqual.new, src: "raise 'unreachable'")
+    assert_raise(ArgumentError) {erb.result}
+  end
+
   def test_prohibited_marshal_load_def_method
     erb = ERB.allocate
     erb.instance_variable_set(:@src, "")
@@ -673,6 +692,11 @@ def test_prohibited_marshal_load_def_method
     assert_raise(ArgumentError) {erb.def_method(Class.new, 'render')}
   end
 
+  def test_prohibited_marshal_load_def_method_with_overridden_equal
+    erb = marshal_loaded_erb(AlwaysEqual.new)
+    assert_raise(ArgumentError) {erb.def_method(Class.new, 'render')}
+  end
+
   def test_prohibited_marshal_load_def_module
     erb = ERB.allocate
     erb.instance_variable_set(:@src, "")