am d041bf20: Merge "bionic/x86: fix one potential deadlock in __set_tls()"

* commit 'd041bf2095f5f133c87f7ba632a8dfb39537a437': bionic/x86: fix one potential deadlock in __set_tls()
2012-02-23 12:29:10 -08:00 · 2012-02-23 12:29:10 -08:00 · a71aefc66f
parent 62daffe147 d041bf2095
commit a71aefc66f
1 changed files with 1 additions and 0 deletions
--- a/libc/arch-x86/bionic/__set_tls.c
+++ b/libc/arch-x86/bionic/__set_tls.c
@ -83,6 +83,7 @@ int __set_tls(void *ptr)
    if (rc != 0)
    {
        /* could not set thread local area */
+        pthread_mutex_unlock(&_tls_desc_lock);
        return -1;
    }