diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-07 05:49:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-07 05:49:31 +0000 |
commit | 557a00f1aa531fb480a326952365eef0fab611bd (patch) | |
tree | c2f02b87e8bb9e28a4681a2d8841ae3e96fa88e2 | |
parent | b032d111abc06e166b890f9f4d2a757af80116fd (diff) | |
download | ruby-557a00f1aa531fb480a326952365eef0fab611bd.tar.gz |
thread.c: interrupt queue on uninitialized thread
* thread.c (rb_thread_pending_interrupt_p): no pending interrupt
before initialization.
* thread.c (thread_raise_m, rb_thread_kill): uninitialized thread
cannot interrupt. [ruby-core:72732] [Bug #11959]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | test/ruby/test_thread.rb | 19 | ||||
-rw-r--r-- | thread.c | 13 |
3 files changed, 38 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Thu Jan 7 14:49:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * thread.c (rb_thread_pending_interrupt_p): no pending interrupt + before initialization. + + * thread.c (thread_raise_m, rb_thread_kill): uninitialized thread + cannot interrupt. [ruby-core:72732] [Bug #11959] + Thu Jan 7 11:34:14 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * include/ruby/backward.h (ruby_show_copyright_to_die): for source diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index dc929ce4fd..f8036795dc 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -748,9 +748,24 @@ _eom end def test_uninitialized - c = Class.new(Thread) - c.class_eval { def initialize; end } + c = Class.new(Thread) {def initialize; end} assert_raise(ThreadError) { c.new.start } + + bug11959 = '[ruby-core:72732] [Bug #11959]' + + c = Class.new(Thread) {def initialize; exit; end} + assert_raise(ThreadError, bug11959) { c.new } + + c = Class.new(Thread) {def initialize; raise; end} + assert_raise(ThreadError, bug11959) { c.new } + + c = Class.new(Thread) { + def initialize + pending = pending_interrupt? + super {pending} + end + } + assert_equal(false, c.new.value, bug11959) end def test_backtrace @@ -1559,6 +1559,14 @@ rb_threadptr_pending_interrupt_enque(rb_thread_t *th, VALUE v) th->pending_interrupt_queue_checked = 0; } +static void +threadptr_check_pending_interrupt_queue(rb_thread_t *th) +{ + if (!th->pending_interrupt_queue) { + rb_raise(rb_eThreadError, "uninitialized thread"); + } +} + enum handle_interrupt_timing { INTERRUPT_NONE, INTERRUPT_IMMEDIATE, @@ -1866,6 +1874,9 @@ rb_thread_pending_interrupt_p(int argc, VALUE *argv, VALUE target_thread) GetThreadPtr(target_thread, target_th); + if (!target_th->pending_interrupt_queue) { + return Qfalse; + } if (rb_threadptr_pending_interrupt_empty_p(target_th)) { return Qfalse; } @@ -2179,6 +2190,7 @@ thread_raise_m(int argc, VALUE *argv, VALUE self) rb_thread_t *target_th; rb_thread_t *th = GET_THREAD(); GetThreadPtr(self, target_th); + threadptr_check_pending_interrupt_queue(target_th); rb_threadptr_raise(target_th, argc, argv); /* To perform Thread.current.raise as Kernel.raise */ @@ -2223,6 +2235,7 @@ rb_thread_kill(VALUE thread) rb_threadptr_to_kill(th); } else { + threadptr_check_pending_interrupt_queue(th); rb_threadptr_pending_interrupt_enque(th, eKillSignal); rb_threadptr_interrupt(th); } |