diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-06-02 18:55:06 +0900 |
|---|---|---|
| committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-06-02 19:01:56 +0900 |
| commit | d05f04d27dd86c67e4a8dfff4392f806cf577bdf (patch) | |
| tree | fe11553f85af998ce598eb93745e773f5a0b8ad0 | |
| parent | c53aebb1d2eb5afbb18f9b3db9f9c956a463a4e1 (diff) | |
Fixed `defined?` against protected method call
Protected methods are restricted to be called according to the
class/module in where it is defined, not the actual receiver's
class. [Bug #16931]
| -rw-r--r-- | test/ruby/test_defined.rb | 1 | ||||
| -rw-r--r-- | vm_insnhelper.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/ruby/test_defined.rb b/test/ruby/test_defined.rb index 387472a62d..e1571d5714 100644 --- a/test/ruby/test_defined.rb +++ b/test/ruby/test_defined.rb @@ -59,6 +59,7 @@ class TestDefined < Test::Unit::TestCase f = Foo.new assert_nil(defined?(f.foo)) # protected method f.bar(f) { |v| assert(v) } + f.bar(Class.new(Foo).new) { |v| assert(v, "inherited protected method") } end def test_defined_undefined_method diff --git a/vm_insnhelper.c b/vm_insnhelper.c index f6e379582e..9494b8b20c 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3603,7 +3603,7 @@ vm_defined(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, rb_num_t op_ case METHOD_VISI_PRIVATE: break; case METHOD_VISI_PROTECTED: - if (!rb_obj_is_kind_of(GET_SELF(), rb_class_real(klass))) { + if (!rb_obj_is_kind_of(GET_SELF(), rb_class_real(me->defined_class))) { break; } case METHOD_VISI_PUBLIC: |