commit 4e6043a355ccc04b3e931edd7616d35ef5691278
author David 'Digit' Turner <digit@google.com> Tue Jun 29 12:55:34 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 29 12:55:34 2010 -0700
tree cbb6044e78c1b4619a4bccee56f257ba6400c18c
parent 68bcaa4a7b12250d2582fdf59a9e331537e98be0
parent 7d1d98b97e947de22aff4c0b67eec7ae68c822ee

am 7d1d98b9: am a02b93bd: libc: add sanity checks to pthread_mutex_destroy()

Merge commit '7d1d98b97e947de22aff4c0b67eec7ae68c822ee'

* commit '7d1d98b97e947de22aff4c0b67eec7ae68c822ee':
  libc: add sanity checks to pthread_mutex_destroy()

libc/bionic/pthread.c

diff --git a/libc/bionic/pthread.c b/libc/bionic/pthread.c
index a60da27..b28cd9f 100644
--- a/libc/bionic/pthread.c
+++ b/libc/bionic/pthread.c
@@ -880,8 +880,13 @@
 
 int pthread_mutex_destroy(pthread_mutex_t *mutex)
 {
-    if (__unlikely(mutex == NULL))
-        return EINVAL;
+    int ret;
+
+    /* use trylock to ensure that the mutex value is
+     * valid and is not already locked. */
+    ret = pthread_mutex_trylock(mutex);
+    if (ret != 0)
+        return ret;
 
     mutex->value = 0xdead10cc;
     return 0;

libc/docs/CHANGES.TXT

diff --git a/libc/docs/CHANGES.TXT b/libc/docs/CHANGES.TXT
index 02526e2..5e0c1bd 100644
--- a/libc/docs/CHANGES.TXT
+++ b/libc/docs/CHANGES.TXT
@@ -3,7 +3,9 @@
 
 Differences between current and Android 2.2:
 
-- <pthread.h>: Add reader/writer locks implementation.
+- <pthread.h>: Add reader/writer locks implementation. Add sanity
+  checking to pthread_mutex_destroy() (e.g. a locked mutex will return
+  EBUSY).
 
 - <math.h>: Added sincos(), sincosf() and sincosl() (GLibc compatibility).