summaryrefslogtreecommitdiff
path: root/signal.c
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-17 06:23:24 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-17 06:23:24 +0000
commit43e1316eb7c3f64797bc766ad45f4dff99b3cbdf (patch)
tree356516e68269e5ffedf2ad72a3a3d245eb82616f /signal.c
parent95285e34575777ab42daf3070477814674c67ad0 (diff)
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
Diffstat (limited to 'signal.c')
-rw-r--r--signal.c2
1 files changed, 1 insertions, 1 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);
}