diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-27 02:00:19 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-27 02:00:19 +0000 |
commit | b1a18cf49bc475e6c563f55b23fa36594d70f4bc (patch) | |
tree | 0dc0c659cd7a5cfd335118f1c263978277fa6d35 /thread.c | |
parent | 8079f8a6f25bd1e6ef9fa0bff569a850c31c6fb3 (diff) |
* thread.c (thread_join): raises ThreadError if target therad
is a main thread.
* test/ruby/test_thread.rb (test_thread_join_main_thread):
test for the above.
* NEWS: news for the above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -739,6 +739,9 @@ thread_join(rb_thread_t *target_th, double delay) if (th == target_th) { rb_raise(rb_eThreadError, "Target thread must not be current thread"); } + if (GET_VM()->main_thread == target_th) { + rb_raise(rb_eThreadError, "Target thread must not be main thread"); + } arg.target = target_th; arg.waiting = th; |