From 9b1f5678c29cc48bc5035f5bb581e506c4cf66fa Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 22 Aug 1997 19:11:02 +0000
Subject: Fixed infinite recursion bug in PTHREAD_MUTEX_INITIALIZER.

---
 cpukit/posix/src/mutex.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'cpukit/posix')

diff --git a/cpukit/posix/src/mutex.c b/cpukit/posix/src/mutex.c
index 037791a252..fa2ccc9cc5 100644
--- a/cpukit/posix/src/mutex.c
+++ b/cpukit/posix/src/mutex.c
@@ -230,17 +230,22 @@ int pthread_mutex_init(
   if ( !mutex )
     return EINVAL;
 
-  /* EBUSY if *mutex is a valid id */
+  /* avoid infinite recursion on call to this routine in _POSIX_Mutex_Get */
 
-  mutex_in_use = _POSIX_Mutex_Get( mutex, &location );
-  switch ( location ) {
-    case OBJECTS_ERROR:
-      break;
-    case OBJECTS_REMOTE:
-    case OBJECTS_LOCAL:
-      _Thread_Enable_dispatch();
-      return EBUSY;
-  };
+  if ( *mutex != PTHREAD_MUTEX_INITIALIZER ) {
+
+    /* EBUSY if *mutex is a valid id */
+
+    mutex_in_use = _POSIX_Mutex_Get( mutex, &location );
+    switch ( location ) {
+      case OBJECTS_ERROR:
+        break;
+      case OBJECTS_REMOTE:
+      case OBJECTS_LOCAL:
+        _Thread_Enable_dispatch();
+        return EBUSY;
+    }
+  }
  
   if ( !the_attr->is_initialized ) 
     return EINVAL;
-- 
cgit v1.2.3