From 22468a4f92c7fa7a08e53a674285183b1af49ed4 Mon Sep 17 00:00:00 2001 From: ko1 Date: Tue, 6 Aug 2013 08:33:05 +0000 Subject: * vm_insnhelper.c (vm_push_frame): fix stack overflow check codes. Stack overflow check should be done *after* pushing a stack frame. However, some stack overflow checking codes checked *before* pushing a stack frame with iseq->stack_max. To solve this problem, add a new parameter `stack_max' to specify a possible consuming stack size. * vm_core.h (CHECK_VM_STACK_OVERFLOW0): add to share the stack overflow checking code. * insns.def: catch up this change. * vm.c, vm_eval.c: ditto. * test/ruby/test_exception.rb: add a stack overflow test. This code is reported by nobu. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'vm.c') diff --git a/vm.c b/vm.c index 3150ee8ac6..a8246d4c24 100644 --- a/vm.c +++ b/vm.c @@ -141,10 +141,9 @@ vm_set_top_stack(rb_thread_t * th, VALUE iseqval) } /* for return */ - CHECK_VM_STACK_OVERFLOW(th->cfp, iseq->local_size + iseq->stack_max); vm_push_frame(th, iseq, VM_FRAME_MAGIC_TOP | VM_FRAME_FLAG_FINISH, th->top_self, rb_cObject, VM_ENVVAL_BLOCK_PTR(0), - iseq->iseq_encoded, th->cfp->sp, iseq->local_size, 0); + iseq->iseq_encoded, th->cfp->sp, iseq->local_size, 0, iseq->stack_max); } static void @@ -153,11 +152,10 @@ vm_set_eval_stack(rb_thread_t * th, VALUE iseqval, const NODE *cref, rb_block_t rb_iseq_t *iseq; GetISeqPtr(iseqval, iseq); - CHECK_VM_STACK_OVERFLOW(th->cfp, iseq->local_size + iseq->stack_max); vm_push_frame(th, iseq, VM_FRAME_MAGIC_EVAL | VM_FRAME_FLAG_FINISH, base_block->self, base_block->klass, VM_ENVVAL_PREV_EP_PTR(base_block->ep), iseq->iseq_encoded, - th->cfp->sp, iseq->local_size, 0); + th->cfp->sp, iseq->local_size, 0, iseq->stack_max); if (cref) { th->cfp->ep[-1] = (VALUE)cref; @@ -622,7 +620,6 @@ invoke_block_from_c(rb_thread_t *th, const rb_block_t *block, VM_FRAME_MAGIC_LAMBDA : VM_FRAME_MAGIC_BLOCK; cfp = th->cfp; - CHECK_VM_STACK_OVERFLOW(cfp, argc + iseq->stack_max); for (i=0; isp[i] = argv[i]; @@ -636,7 +633,7 @@ invoke_block_from_c(rb_thread_t *th, const rb_block_t *block, VM_ENVVAL_PREV_EP_PTR(block->ep), iseq->iseq_encoded + opt_pc, cfp->sp + arg_size, iseq->local_size - arg_size, - th->passed_me); + th->passed_me, iseq->stack_max); th->passed_me = 0; if (cref) { @@ -1382,7 +1379,7 @@ vm_exec(rb_thread_t *th) catch_iseq->iseq_encoded, cfp->sp + 1 /* push value */, catch_iseq->local_size - 1, - cfp->me); + cfp->me, catch_iseq->stack_max); state = 0; th->state = 0; @@ -1524,7 +1521,7 @@ rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, VALUE val; vm_push_frame(th, DATA_PTR(iseqval), VM_FRAME_MAGIC_TOP | VM_FRAME_FLAG_FINISH, - recv, CLASS_OF(recv), VM_ENVVAL_BLOCK_PTR(blockptr), 0, reg_cfp->sp, 1, 0); + recv, CLASS_OF(recv), VM_ENVVAL_BLOCK_PTR(blockptr), 0, reg_cfp->sp, 1, 0, 0); val = (*func)(arg); @@ -1967,7 +1964,7 @@ th_init(rb_thread_t *th, VALUE self) th->cfp = (void *)(th->stack + th->stack_size); vm_push_frame(th, 0 /* dummy iseq */, VM_FRAME_MAGIC_TOP | VM_FRAME_FLAG_FINISH, - Qnil /* dummy self */, Qnil /* dummy klass */, VM_ENVVAL_BLOCK_PTR(0), 0 /* dummy pc */, th->stack, 1, 0); + Qnil /* dummy self */, Qnil /* dummy klass */, VM_ENVVAL_BLOCK_PTR(0), 0 /* dummy pc */, th->stack, 1, 0, 0); th->status = THREAD_RUNNABLE; th->errinfo = Qnil; -- cgit v1.2.3