1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

signal.c: no cfunc frame at stack overflow

Browse Source 
* signal.c (check_stack_overflow): avoid pushing a cfunc frame,
  trying to fix stack overflow deadlock.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46495 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-06-22 01:47:14 +00:00
parent c7a7e60409
commit 2af4240fbb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
signal.c
View File

@ -737,7 +737,8 @@ check_stack_overflow(const uintptr_t addr, const ucontext_t *ctx)
/* SP in ucontext is not decremented yet when `push` failed, so /* SP in ucontext is not decremented yet when `push` failed, so
* the fault page can be the next. */ * the fault page can be the next. */
if (sp_page == fault_page || sp_page == fault_page + 1) { if (sp_page == fault_page || sp_page == fault_page + 1) {
ruby_thread_stack_overflow(GET_THREAD()); rb_thread_t *th = ruby_current_thread;
ruby_thread_stack_overflow(th);
} }
} }
#else #else
@ -745,7 +746,7 @@ static void
check_stack_overflow(const void *addr) check_stack_overflow(const void *addr)
{ {
int ruby_stack_overflowed_p(const rb_thread_t *, const void *); int ruby_stack_overflowed_p(const rb_thread_t *, const void *);
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = ruby_current_thread;
if (ruby_stack_overflowed_p(th, addr)) { if (ruby_stack_overflowed_p(th, addr)) {
ruby_thread_stack_overflow(th); ruby_thread_stack_overflow(th);
} }