diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-21 07:48:29 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-21 07:48:29 +0000 |
| commit | 8724448ed5eacc86f903f85b6eb87895714b8569 (patch) | |
| tree | 2ca4aef7df0970f09bbe23c9edbbc09032e208b6 /thread_win32.c | |
| parent | d2c3d9dd0b9ed4d587654ce68bdbc8663a77b9df (diff) | |
* thread_win32.c (native_sleep): must block reentrance when accessing
th->unblock.
fixed [ruby-core:17341], reported by Bill Kelly <billk at cts.com>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread_win32.c')
| -rw-r--r-- | thread_win32.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/thread_win32.c b/thread_win32.c index 993f5f271d..8365ff2569 100644 --- a/thread_win32.c +++ b/thread_win32.c @@ -229,8 +229,10 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable) { DWORD ret; + native_mutex_lock(&th->interrupt_lock); th->unblock.func = ubf_handle; th->unblock.arg = th; + native_mutex_unlock(&th->interrupt_lock); if (RUBY_VM_INTERRUPTED(th)) { /* interrupted. return immediate */ @@ -241,8 +243,10 @@ native_sleep(rb_thread_t *th, struct timeval *tv, int deadlockable) thread_debug("native_sleep done (%lu)\n", ret); } + native_mutex_lock(&th->interrupt_lock); th->unblock.func = 0; th->unblock.arg = 0; + native_mutex_unlock(&th->interrupt_lock); } GVL_UNLOCK_END(); th->status = prev_status; |