1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_method.c (rb_method_boundp):

Browse Source 
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
This commit is contained in:
knu 2012-02-13 14:02:26 +00:00
parent 261400e7a9
commit 23473d1f9f
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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> Mon Feb 13 21:52:06 2012 Narihiro Nakamura <authornari@gmail.com>
* gc.c (HEAP_OBJ_LIMIT, HEAP_BITMAP_LIMIT): HEAP_OBJ_LIMIT used * gc.c (HEAP_OBJ_LIMIT, HEAP_BITMAP_LIMIT): HEAP_OBJ_LIMIT used

4
test/ruby/test_method.rb
View File

@ -420,7 +420,7 @@ class TestMethod < Test::Unit::TestCase
assert_equal(true, respond_to?(:mv1)) assert_equal(true, respond_to?(:mv1))
assert_equal(false, respond_to?(:mv2)) 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?(:mv1, true))
assert_equal(true, respond_to?(:mv2, 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(true, v.respond_to?(:mv1))
assert_equal(false, v.respond_to?(:mv2)) 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?(:mv1, true))
assert_equal(true, v.respond_to?(:mv2, true)) assert_equal(true, v.respond_to?(:mv2, true))

16
vm_method.c
View File

@ -547,8 +547,10 @@ rb_method_boundp(VALUE klass, ID id, int ex)
rb_method_entry_t *me = rb_method_entry(klass, id); rb_method_entry_t *me = rb_method_entry(klass, id);
if (me != 0) { if (me != 0) {
if ((ex & ~NOEX_RESPONDS) && (me->flag & NOEX_PRIVATE)) { if ((ex & ~NOEX_RESPONDS) &&
return FALSE; ((me->flag & NOEX_PRIVATE) ||
((ex & NOEX_RESPONDS) && (me->flag & NOEX_PROTECTED)))) {
return 0;
} }
if (!me->def) return 0; if (!me->def) return 0;
if (me->def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) { if (me->def->type == VM_METHOD_TYPE_NOTIMPLEMENTED) {
@ -1263,11 +1265,11 @@ rb_respond_to(VALUE obj, ID id)
/* /*
* call-seq: * 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 * Returns +true+ if _obj_ responds to the given method. Private and
* method. Private methods are included in the search only if the * protected methods are included in the search only if the optional
* optional second parameter evaluates to +true+. * second parameter evaluates to +true+.
* *
* If the method is not implemented, * If the method is not implemented,
* as Process.fork on Windows, File.lchmod on GNU/Linux, etc., * 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: * 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 * Hook method to return whether the _obj_ can respond to _id_ method
* or not. * or not.