From 5f4b6b984acfbd3e34cc60caefb455bcc03a5306 Mon Sep 17 00:00:00 2001 From: knu Date: Fri, 16 Mar 2007 07:36:08 +0000 Subject: * ext/thread/thread.c (unlock_mutex_inner): Make sure that the given mutex is actually owned by the caller; submitted by: Sylvain Joyeux in [ruby-core:10598]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12069 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/thread/thread.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'ext/thread') 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); -- cgit v1.2.3