diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-29 17:16:05 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-29 17:16:05 +0000 |
commit | 7f2ef1a96e3ae57b578bbb4d996fce3ddefc81fa (patch) | |
tree | bc6299ca6771ec0811ce6b11331987b4ebf0ca46 /eval.c | |
parent | 2f2e8455e3644385e517299163bb538cd4f07030 (diff) | |
download | ruby-7f2ef1a96e3ae57b578bbb4d996fce3ddefc81fa.tar.gz |
* enum.c (enum_count): call #size using rb_funcall_no_recursive()
to prevent infinite recursive calls. [ruby-core:24794]
* vm_eval.c (rb_funcall_no_recursive): utility function to check
direct recursive call.
* vm_eval.c (rb_check_funcall): move from eval.c. [refactoring]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25560 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 32 |
1 files changed, 0 insertions, 32 deletions
@@ -492,38 +492,6 @@ rb_f_raise(int argc, VALUE *argv) return Qnil; /* not reached */ } -struct rescue_funcall_args { - VALUE obj; - ID id; - int argc; - VALUE *argv; -}; - -static VALUE -check_funcall(struct rescue_funcall_args *args) -{ - return rb_funcall2(args->obj, args->id, args->argc, args->argv); -} - -static VALUE -check_failed(VALUE data) -{ - return data; -} - -VALUE -rb_check_funcall(VALUE obj, ID id, int argc, VALUE *argv) -{ - struct rescue_funcall_args args; - - args.obj = obj; - args.id = id; - args.argc = argc; - args.argv = argv; - return rb_rescue2(check_funcall, (VALUE)&args, check_failed, Qundef, - rb_eNoMethodError, (VALUE)0); -} - static VALUE make_exception(int argc, VALUE *argv, int isstr) { |