threads: Fix startup crash with weak symbol hack

Fix another issue when running with older libc, threads and libpthread
not linked in.

1 files changed, 17 insertions, 8 deletions

diff --git a/threads.c b/threads.c
index 56a917e6..60dbce4c 100644
--- a/threads.c
+++ b/threads.c
@@ -40,6 +40,7 @@
 #include <sys/single_threaded.h>
 
 #define XML_IS_THREADED() (!__libc_single_threaded)
+#define XML_IS_NEVER_THREADED() 0
 
 #elif defined(HAVE_POSIX_THREADS) && \
       defined(__GLIBC__) && \
@@ -78,12 +79,14 @@
 
 #define XML_PTHREAD_WEAK
 #define XML_IS_THREADED() libxml_is_threaded
+#define XML_IS_NEVER_THREADED() (!libxml_is_threaded)
 
 static int libxml_is_threaded = -1;
 
 #else /* other POSIX platforms */
 
 #define XML_IS_THREADED() 1
+#define XML_IS_NEVER_THREADED() 0
 
 #endif
 
@@ -143,7 +146,8 @@ void
 xmlInitMutex(xmlMutexPtr mutex)
 {
 #ifdef HAVE_POSIX_THREADS
-    pthread_mutex_init(&mutex->lock, NULL);
+    if (XML_IS_NEVER_THREADED() == 0)
+        pthread_mutex_init(&mutex->lock, NULL);
 #elif defined HAVE_WIN32_THREADS
     InitializeCriticalSection(&mutex->cs);
 #else
@@ -180,7 +184,8 @@ void
 xmlCleanupMutex(xmlMutexPtr mutex)
 {
 #ifdef HAVE_POSIX_THREADS
-    pthread_mutex_destroy(&mutex->lock);
+    if (XML_IS_NEVER_THREADED() == 0)
+        pthread_mutex_destroy(&mutex->lock);
 #elif defined HAVE_WIN32_THREADS
     DeleteCriticalSection(&mutex->cs);
 #else
@@ -265,10 +270,12 @@ xmlNewRMutex(void)
     if ((tok = malloc(sizeof(xmlRMutex))) == NULL)
         return (NULL);
 #ifdef HAVE_POSIX_THREADS
-    pthread_mutex_init(&tok->lock, NULL);
-    tok->held = 0;
-    tok->waiters = 0;
-    pthread_cond_init(&tok->cv, NULL);
+    if (XML_IS_NEVER_THREADED() == 0) {
+        pthread_mutex_init(&tok->lock, NULL);
+        tok->held = 0;
+        tok->waiters = 0;
+        pthread_cond_init(&tok->cv, NULL);
+    }
 #elif defined HAVE_WIN32_THREADS
     InitializeCriticalSection(&tok->cs);
 #endif
@@ -288,8 +295,10 @@ xmlFreeRMutex(xmlRMutexPtr tok ATTRIBUTE_UNUSED)
     if (tok == NULL)
         return;
 #ifdef HAVE_POSIX_THREADS
-    pthread_mutex_destroy(&tok->lock);
-    pthread_cond_destroy(&tok->cv);
+    if (XML_IS_NEVER_THREADED() == 0) {
+        pthread_mutex_destroy(&tok->lock);
+        pthread_cond_destroy(&tok->cv);
+    }
 #elif defined HAVE_WIN32_THREADS
     DeleteCriticalSection(&tok->cs);
 #endif