diff --git a/libc/bionic/pthread_internal.cpp b/libc/bionic/pthread_internal.cpp index 1967ccf8c..8946f79af 100644 --- a/libc/bionic/pthread_internal.cpp +++ b/libc/bionic/pthread_internal.cpp @@ -81,6 +81,12 @@ void __pthread_internal_remove_and_free(pthread_internal_t* thread) { pthread_internal_t* __pthread_internal_find(pthread_t thread_id) { pthread_internal_t* thread = reinterpret_cast(thread_id); + + // check if thread is pthread_self() before acquiring the lock + if (thread == __get_thread()) { + return thread; + } + ScopedPthreadMutexLocker locker(&g_thread_list_lock); for (pthread_internal_t* t = g_thread_list; t != NULL; t = t->next) {