From 38bc085f71ad2056f259ec60e4920acab392506b Mon Sep 17 00:00:00 2001 From: ko1 Date: Fri, 10 Feb 2017 08:15:39 +0000 Subject: check thread deadness correctly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57595 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- thread.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'thread.c') diff --git a/thread.c b/thread.c index b6b602f9d0..82369cb9d4 100644 --- a/thread.c +++ b/thread.c @@ -2107,6 +2107,13 @@ rb_threadptr_raise(rb_thread_t *th, int argc, VALUE *argv) else { exc = rb_make_exception(argc, argv); } + + /* making an exception object can switch thread, + so we need to check thread deadness again */ + if (rb_threadptr_dead(th)) { + return Qnil; + } + rb_threadptr_setup_exception(GET_THREAD(), exc, Qundef); rb_threadptr_pending_interrupt_enque(th, exc); rb_threadptr_interrupt(th); -- cgit v1.2.3