1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

thread_pthread.c (unregister_ubf_list): assert unblock.func is unset

Browse Source 
We must not allow reentry into ubf_list_head once we delete
ourselves, otherwise we could hang in there forever.

[ruby-core:88218] [Bug #14945]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-07-30 21:48:32 +00:00
parent 508f00314f
commit 86d35a6b1a
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
thread_pthread.c
View File

@ -1178,6 +1178,9 @@ unregister_ubf_list(rb_thread_t *th)
{ {
struct list_node *node = &th->native_thread_data.ubf_list; struct list_node *node = &th->native_thread_data.ubf_list;
/* we can't allow re-entry into ubf_list_head */
VM_ASSERT(th->unblock.func == 0);
if (!list_empty((struct list_head*)node)) { if (!list_empty((struct list_head*)node)) {
rb_native_mutex_lock(&ubf_list_lock); rb_native_mutex_lock(&ubf_list_lock);
list_del_init(node); list_del_init(node);