From 72facac57c1e086b0be8ef86773e0eb7fe14ff1f Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 7 Nov 2009 02:45:08 +0000 Subject: * vm_insnhelper.c (vm_push_frame): add CHECK_STACK_OVERFLOW. [ruby-dev:39592] * eval.c (rb_longjmp): add 1 level backtrace for sysstack_error without calling any method to prevent further stack overflow. * eval.c (make_exception): don't call #exception for sysstack_error to prevent stack overflow. * proc.c (Init_Proc): don't freeze sysstack_error. * eval.c (rb_longjmp): move reentrant check after exception preparation. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_insnhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'vm_insnhelper.c') diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 5b965d215..7974a75cd 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -26,9 +26,11 @@ vm_push_frame(rb_thread_t * th, const rb_iseq_t * iseq, const VALUE *pc, VALUE *sp, VALUE *lfp, int local_size) { - rb_control_frame_t * const cfp = th->cfp = th->cfp - 1; + rb_control_frame_t * const cfp = th->cfp - 1; int i; + CHECK_STACK_OVERFLOW(th->cfp, local_size); + th->cfp = cfp; /* setup vm value stack */ /* nil initialize */ -- cgit