From 43e1316eb7c3f64797bc766ad45f4dff99b3cbdf Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 17 Sep 2014 06:23:24 +0000 Subject: merge revision(s) 46495: [Backport #9971] signal.c: no cfunc frame at stack overflow * 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/branches/ruby_2_0_0@47612 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- signal.c | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/signal.c b/signal.c index dc3f8abd21..c739282d6d 100644 --- a/signal.c +++ b/signal.c @@ -614,7 +614,7 @@ check_stack_overflow(const void *addr) { int ruby_stack_overflowed_p(const rb_thread_t *, const void *); NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th)); - rb_thread_t *th = GET_THREAD(); + rb_thread_t *th = ruby_current_thread; if (ruby_stack_overflowed_p(th, addr)) { ruby_thread_stack_overflow(th); } diff --git a/version.h b/version.h index 45fcc9b384..2eb98af54a 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-09-17" -#define RUBY_PATCHLEVEL 574 +#define RUBY_PATCHLEVEL 575 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 9 -- cgit v1.2.3