diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-04 08:37:48 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-04 08:37:48 +0000 |
commit | 7dfb872489930957e1091256ed4ee6b83e9b486a (patch) | |
tree | d239e7623103f30d803986a87f3d5ddfd55a1276 /vm_eval.c | |
parent | 2845b098a76f5d26aa658c1fd8c82badec8bcd08 (diff) | |
download | ruby-7dfb872489930957e1091256ed4ee6b83e9b486a.tar.gz ruby-7dfb872489930957e1091256ed4ee6b83e9b486a.tar.xz ruby-7dfb872489930957e1091256ed4ee6b83e9b486a.zip |
* vm_eval.c (vm_call_super): fixed typo, and get rid of too large
alloca. [ruby-core:17922]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18357 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r-- | vm_eval.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -148,12 +148,21 @@ vm_call_super(rb_thread_t * const th, const int argc, const VALUE * const argv) body = body->nd_body; } else { - VALUE *argv_m = ALLOCA_N(VALUE, argc+1); + VALUE *argv_m, result, argv_ary = 0; + if (argc < 0x100) { + argv_m = ALLOCA_N(VALUE, argc+1); + } + else { + argv_ary = rb_ary_tmp_new(argc+1); + argv_m = RARRAY_PTR(argv_ary); + } MEMCPY(argv_m + 1, argv, VALUE, argc); argv_m[0] = ID2SYM(id); th->method_missing_reason = 0; th->passed_block = 0; - return rb_funcall2(recv, idMethodMissing, argc + 1, argv); + result = rb_funcall2(recv, idMethodMissing, argc + 1, argv_m); + if (argv_ary) rb_ary_clear(argv_ary); + return result; } return vm_call0(th, klass, recv, id, id, argc, argv, body, CALL_SUPER); |