diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-13 14:02:26 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-13 14:02:26 +0000 |
| commit | 23473d1f9fc33151f0d5804e0cca824794a0bfe6 (patch) | |
| tree | d18f506bf0d26b9a3847b3f9064456773274eb20 | |
| parent | 261400e7a9b4e8774a058e9a6f53fc885329c5f8 (diff) | |
* vm_method.c (rb_method_boundp):
obj.respond_to?(:a_protected_method) should return false because
calling a protected method may cause NoMethodError if called
from outside the class inheritance tree. Kernel#respond_to? is
mostly used to test if it is safe to call a method, so the false
positive should be avoided. [ruby-dev:40461] [ruby-dev:41739]
[ruby-dev:41837]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | test/ruby/test_method.rb | 4 | ||||
| -rw-r--r-- | vm_method.c | 16 |
3 files changed, 21 insertions, 9 deletions
@@ -1,3 +1,13 @@ +Mon Feb 13 23:01:50 2012 Akinori MUSHA <knu@iDaemons.org> + + * vm_method.c (rb_method_boundp): + obj.respond_to?(:a_protected_method) should return false because + calling a protected method may cause NoMethodError if called + from outside the class inheritance tree. Kernel#respond_to? is + mostly used to test if it is safe to call a method, so the false + positive should be avoided. [ruby-dev:40461] [ruby-dev:41739] + [ruby-dev:41837] + Mon Feb 13 21:52:06 2012 Narihiro Nakamura <authornari@gmail.com> * gc.c (HEAP_OBJ_LIMIT, HEAP_BITMAP_LIMIT): HEAP_OBJ_LIMIT used diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 2cc0de5409..8dbca7dd3c 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -420,7 +420,7 @@ class TestMethod < Test::Unit::TestCase assert_equal(true, respond_to?(:mv1)) assert_equal(false, respond_to?(:mv2)) - assert_equal(true, respond_to?(:mv3)) + assert_equal(false, respond_to?(:mv3)) assert_equal(true, respond_to?(:mv1, true)) assert_equal(true, respond_to?(:mv2, true)) @@ -442,7 +442,7 @@ class TestMethod < Test::Unit::TestCase assert_equal(true, v.respond_to?(:mv1)) assert_equal(false, v.respond_to?(:mv2)) - assert_equal(true, v.respond_to?(:mv3)) + assert_equal(false, v.respond_to?(:mv3)) assert_equal(true, v.respond_to?(:mv1, true)) assert_equal(true, v.respond_to?(:mv2, true)) diff --git a/vm_method.c b/vm_method.c index 3811f48246..9ffae4ccae 100644 --- a/vm_method.c +++ b/vm_method.c @@ -547,8 +547,10 @@ rb_method_boundp(VALUE klass, ID id, int ex) rb_method_entry_t *me = rb_method_entry(klass, id); if (me != 0) { - if ((ex & ~NOEX_RESPONDS) && (me->flag & NOEX_PRIVATE)) { - return FALSE; + if ((ex & ~NOEX_RESPONDS) && + ((me->flag & NOEX_PRIVATE) || + ((ex & NOEX_RESPONDS) && (me->flag & NOEX_PROTECTED)))) { + return 0; } if (!me->def) return 0; if (me->def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) { @@ -1263,11 +1265,11 @@ rb_respond_to(VALUE obj, ID id) /* * call-seq: - * obj.respond_to?(symbol, include_private=false) -> true or false + * obj.respond_to?(symbol, include_all=false) -> true or false * - * Returns +true+ if _obj_ responds to the given - * method. Private methods are included in the search only if the - * optional second parameter evaluates to +true+. + * Returns +true+ if _obj_ responds to the given method. Private and + * protected methods are included in the search only if the optional + * second parameter evaluates to +true+. * * If the method is not implemented, * as Process.fork on Windows, File.lchmod on GNU/Linux, etc., @@ -1300,7 +1302,7 @@ obj_respond_to(int argc, VALUE *argv, VALUE obj) /* * call-seq: - * obj.respond_to_missing?(symbol, include_private) -> true or false + * obj.respond_to_missing?(symbol, include_all) -> true or false * * Hook method to return whether the _obj_ can respond to _id_ method * or not. |