fix tsearch to avoid crash on oom

[musl] / src / thread / pthread_mutex_unlock.c

diff --git a/src/thread/pthread_mutex_unlock.c b/src/thread/pthread_mutex_unlock.c
index 23e64ac..02da92a 100644 (file)
--- a/src/thread/pthread_mutex_unlock.c
+++ b/src/thread/pthread_mutex_unlock.c
@@ -1,19 +1,37 @@
 #include "pthread_impl.h"
 
-int pthread_mutex_unlock(pthread_mutex_t *m)
+int __pthread_mutex_unlock(pthread_mutex_t *m)
 {
-       if (m->__type == PTHREAD_MUTEX_RECURSIVE) {
-               if (a_fetch_add(&m->__lock, -1)==1 && m->__waiters)
-                       __wake(&m->__lock, 1, 0);
-               return 0;
-       }
-
-       if (m->__type == PTHREAD_MUTEX_ERRORCHECK
-        && m->__owner != pthread_self())
-               return EPERM;
+       pthread_t self;
+       int waiters = m->_m_waiters;
+       int cont;
+       int type = m->_m_type & 15;
+       int priv = (m->_m_type & 128) ^ 128;
 
-       m->__owner = 0;
-       m->__lock = 0;
-       if (m->__waiters) __wake(&m->__lock, 1, 0);
+       if (type != PTHREAD_MUTEX_NORMAL) {
+               self = __pthread_self();
+               if ((m->_m_lock&0x7fffffff) != self->tid)
+                       return EPERM;
+               if ((type&3) == PTHREAD_MUTEX_RECURSIVE && m->_m_count)
+                       return m->_m_count--, 0;
+               if (!priv) {
+                       self->robust_list.pending = &m->_m_next;
+                       __vm_lock();
+               }
+               volatile void *prev = m->_m_prev;
+               volatile void *next = m->_m_next;
+               *(volatile void *volatile *)prev = next;
+               if (next != &self->robust_list.head) *(volatile void *volatile *)
+                       ((char *)next - sizeof(void *)) = prev;
+       }
+       cont = a_swap(&m->_m_lock, (type & 8) ? 0x40000000 : 0);
+       if (type != PTHREAD_MUTEX_NORMAL && !priv) {
+               self->robust_list.pending = 0;
+               __vm_unlock();
+       }
+       if (waiters || cont<0)
+               __wake(&m->_m_lock, 1, priv);
        return 0;
 }
+
+weak_alias(__pthread_mutex_unlock, pthread_mutex_unlock);