diff options
| -rw-r--r-- | signal.c | 8 | ||||
| -rw-r--r-- | vm_eval.c | 2 | ||||
| -rw-r--r-- | vm_insnhelper.c | 6 |
3 files changed, 9 insertions, 7 deletions
@@ -763,7 +763,7 @@ static const char *received_signal; #endif #if defined(USE_SIGALTSTACK) || defined(_WIN32) -NORETURN(void rb_threadptr_stack_overflow(rb_thread_t *th)); +NORETURN(void rb_threadptr_stack_overflow(rb_thread_t *th, int crit)); # if defined __HAIKU__ # define USE_UCONTEXT_REG 1 # elif !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__ || defined __amd64__)) @@ -843,14 +843,16 @@ check_stack_overflow(int sig, const uintptr_t addr, const ucontext_t *ctx) if (sp_page == fault_page || sp_page == fault_page + 1 || sp_page <= fault_page && fault_page <= bp_page) { rb_thread_t *th = ruby_current_thread; + int crit = FALSE; if ((uintptr_t)th->ec.tag->buf / pagesize <= fault_page + 1) { /* drop the last tag if it is close to the fault, * otherwise it can cause stack overflow again at the same * place. */ th->ec.tag = th->ec.tag->prev; + crit = TRUE; } reset_sigmask(sig); - rb_threadptr_stack_overflow(th); + rb_threadptr_stack_overflow(th, crit); } } # else @@ -861,7 +863,7 @@ check_stack_overflow(int sig, const void *addr) rb_thread_t *th = ruby_current_thread; if (ruby_stack_overflowed_p(th, addr)) { reset_sigmask(sig); - rb_threadptr_stack_overflow(th); + rb_threadptr_stack_overflow(th, FALSE); } } # endif @@ -258,7 +258,7 @@ stack_check(rb_thread_t *th) if (!rb_thread_raised_p(th, RAISED_STACKOVERFLOW) && rb_threadptr_stack_check(th)) { rb_thread_raised_set(th, RAISED_STACKOVERFLOW); - rb_threadptr_stack_overflow(th); + rb_threadptr_stack_overflow(th, FALSE); } } diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 9e85f38be9..ffab48419b 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -52,11 +52,11 @@ vm_stackoverflow(void) threadptr_stack_overflow(GET_THREAD(), TRUE); } -NORETURN(void rb_threadptr_stack_overflow(rb_thread_t *th)); +NORETURN(void rb_threadptr_stack_overflow(rb_thread_t *th, int crit)); void -rb_threadptr_stack_overflow(rb_thread_t *th) +rb_threadptr_stack_overflow(rb_thread_t *th, int crit) { - if (rb_during_gc()) { + if (crit || rb_during_gc()) { th->ec.raised_flag = RAISED_STACKOVERFLOW; th->ec.errinfo = th->vm->special_exceptions[ruby_error_stackfatal]; TH_JUMP_TAG(th, TAG_RAISE); |