summaryrefslogtreecommitdiff
path: root/ext/thread
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-16 07:36:08 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-16 07:36:08 +0000
commit5f4b6b984acfbd3e34cc60caefb455bcc03a5306 (patch)
tree8e56adb8e72df8330101f21f0df92a89b33fd526 /ext/thread
parent15b97d196a7ea7097d2c9979fa0f46a0c3e702d4 (diff)
* 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]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/thread')
-rw-r--r--ext/thread/thread.c7
1 files changed, 6 insertions, 1 deletions
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);