diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/thread/thread.c | 7 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Fri Mar 16 16:33:58 2007 Akinori MUSHA <knu@iDaemons.org> + + * ext/thread/thread.c (unlock_mutex_inner): Make sure that the + given mutex is actually owned by the caller; submitted by: + Sylvain Joyeux <sylvain.joyeux AT m4x.org> in [ruby-core:10598]. + Fri Mar 16 16:21:35 2007 Akinori MUSHA <knu@iDaemons.org> * ext/thread/thread.c (wait_condvar, lock_mutex): Fix a problem in diff --git a/ext/thread/thread.c b/ext/thread/thread.c index 54681a8c90..d617185a26 100644 --- a/ext/thread/thread.c +++ b/ext/thread/thread.c @@ -430,8 +430,13 @@ unlock_mutex_inner(Mutex *mutex) VALUE waking; if (!RTEST(mutex->owner)) { - return Qundef; + rb_raise(rb_eThreadError, "not owner"); } + + if (mutex->owner != rb_thread_current()) { + rb_raise(rb_eThreadError, "not owner"); + } + mutex->owner = Qnil; waking = wake_one(&mutex->waiting); |