X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fpthread_mutex_unlock.c;h=6c4d7f22a041dce6d7e05b3f6f436888cc1a9e2d;hp=3733788d8ebee7a375d54db6959aef1f8702a623;hb=6232b96f5153d0b718054a8bc569fcd7d596bab2;hpb=18c7ea8055cf733f168d2c74d7cc8523a360f5f1

diff --git a/src/thread/pthread_mutex_unlock.c b/src/thread/pthread_mutex_unlock.c
index 3733788d..6c4d7f22 100644
--- a/src/thread/pthread_mutex_unlock.c
+++ b/src/thread/pthread_mutex_unlock.c
@@ -2,14 +2,29 @@
 
 int pthread_mutex_unlock(pthread_mutex_t *m)
 {
+	pthread_t self;
+
 	if (m->_m_type != PTHREAD_MUTEX_NORMAL) {
-		if (!m->_m_lock || m->_m_lock != __pthread_self()->tid)
-		 	return EPERM;
-		if (m->_m_type == PTHREAD_MUTEX_RECURSIVE && --m->_m_count)
+		if (!m->_m_lock)
+			return EPERM;
+		self = __pthread_self();
+		if ((m->_m_lock&0x1fffffff) != self->tid)
+			return EPERM;
+		if ((m->_m_type&3) == PTHREAD_MUTEX_RECURSIVE && --m->_m_count)
 			return 0;
+		if (m->_m_type >= 4) {
+			self->robust_list.pending = &m->_m_next;
+			*(void **)m->_m_prev = m->_m_next;
+			if (m->_m_next) ((void **)m->_m_next)[-1] = m->_m_prev;
+			a_store(&m->_m_lock, 0);
+			self->robust_list.pending = 0;
+		} else {
+			a_store(&m->_m_lock, 0);
+		}
+	} else {
+		a_store(&m->_m_lock, 0);
 	}
 
-	m->_m_lock = 0;
 	if (m->_m_waiters) __wake(&m->_m_lock, 1, 0);
 	return 0;
 }