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 --- insns.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'insns.def') diff --git a/insns.def b/insns.def index 2a51424a0d..b5ca35c44b 100644 --- a/insns.def +++ b/insns.def @@ -972,7 +972,7 @@ defineclass vm_push_frame(th, class_iseq, VM_FRAME_MAGIC_CLASS, klass, 0, VM_ENVVAL_BLOCK_PTR(GET_BLOCK_PTR()), class_iseq->iseq_encoded, GET_SP(), - class_iseq->local_size, 0); + class_iseq->local_size, 0, class_iseq->stack_max); RESTORE_REGS(); INC_VM_STATE_VERSION(); -- cgit v1.2.3