aboutsummaryrefslogtreecommitdiffstats
path: root/thread.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-31 12:40:19 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-31 12:40:19 +0000
commita2ba50d97119044ddc0a847a89fc5fddcd6e0d83 (patch)
tree7584ed51db547693e48080f8d853fd6672a115ce /thread.c
parentd07940ee1316f15cf9b5fb5fc0c03bd6479aef0b (diff)
downloadruby-a2ba50d97119044ddc0a847a89fc5fddcd6e0d83.tar.gz
* thread.c (thread_start_func_2): check deadlock condition before
release thread stack. fix memory violation when deadlock detected. reported by Max Aller. [Bug #4009] [ruby-core:32982] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/thread.c b/thread.c
index 69fc299fcd..b1a802b89c 100644
--- a/thread.c
+++ b/thread.c
@@ -524,13 +524,14 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s
join_th = join_th->join_list_next;
}
+ thread_unlock_all_locking_mutexes(th);
+ if (th != main_th) rb_check_deadlock(th->vm);
+
if (!th->root_fiber) {
rb_thread_recycle_stack_release(th->stack);
th->stack = 0;
}
}
- thread_unlock_all_locking_mutexes(th);
- if (th != main_th) rb_check_deadlock(th->vm);
if (th->vm->main_thread == th) {
ruby_cleanup(state);
}