Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

vm_method.c: drop include_all flag

* vm_method.c (rb_obj_respond_to): drop optional include_all flag if
  respond_to? method is defined in old style.  [Bug #7722]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit a106b310e5bbe678022b127b9d32bb0a55708002 1 parent 8efeb60
@nobu nobu authored
Showing with 35 additions and 1 deletion.
  1. +5 −0 ChangeLog
  2. +12 −0 test/ruby/test_marshal.rb
  3. +18 −1 vm_method.c
View
5 ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 5 16:25:25 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_method.c (rb_obj_respond_to): drop optional include_all flag if
+ respond_to? method is defined in old style. [Bug #7722]
+
Tue Feb 05 15:04:34 2013 Koichi Sasada <ko1@atdot.net>
* proc.c (rb_binding_new_with_cfp): permit to create binding object
View
12 test/ruby/test_marshal.rb
@@ -550,4 +550,16 @@ def test_module_ivar
assert_raise(TypeError) {Marshal.load("\x04\x08IM\x1cTestMarshal::TestModule\x06:\x0e@ivar_bug\"\x08bug")}
assert_not_operator(TestModule, :instance_variable_defined?, :@bug)
end
+
+ class TestForRespondToFalse
+ def respond_to?(a)
+ false
+ end
+ end
+
+ def test_marshal_respond_to_arity
+ assert_nothing_raised(ArgumentError, '[Bug #7722]') do
+ Marshal.dump(TestForRespondToFalse.new)
+ end
+ end
end
View
19 vm_method.c
@@ -1521,7 +1521,24 @@ rb_obj_respond_to(VALUE obj, ID id, int priv)
return basic_obj_respond_to(obj, id, !RTEST(priv));
}
else {
- return RTEST(rb_funcall(obj, idRespond_to, priv ? 2 : 1, ID2SYM(id), Qtrue));
+ int argc = 1;
+ VALUE args[2];
+ args[0] = ID2SYM(id);
+ args[1] = Qtrue;
+ if (priv) {
+ if (rb_obj_method_arity(obj, idRespond_to) != 1) {
+ argc = 2;
+ }
+ else {
+ VALUE klass = CLASS_OF(obj);
+ rb_warn("%"PRIsVALUE"%c""respond_to?(:%"PRIsVALUE") is"
+ " old fashion which takes only one parameter",
+ (FL_TEST(klass, FL_SINGLETON) ? obj : klass),
+ (FL_TEST(klass, FL_SINGLETON) ? '.' : '#'),
+ QUOTE_ID(id));
+ }
+ }
+ return RTEST(rb_funcall2(obj, idRespond_to, argc, args));
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.