Avoiding SEGFAULT calling pthread_join on a thread with id 0 (#656)

Azure · Mar 19, 2024 · 515007e · 515007e
1 parent 35205d8
commit 515007e
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/src/platform/MpiServer.c b/src/platform/MpiServer.c
@@ -634,20 +634,11 @@ void MpiInitialize(void)
 
 void MpiShutdown(void)
 {
-    int status = 0;
-
     g_serverActive = false;
 
-    if (0 == (status = pthread_cancel(g_mpiServerWorker)))
-    {
-        if (0 != (status = pthread_join(g_mpiServerWorker, NULL)))
-        {
-            OsConfigLogError(GetPlatformLog(), "MpiShutdown: pthread_join failed with %d", status);
-        }
-    }
-    else
+    if (g_mpiServerWorker > 0)
     {
-        OsConfigLogError(GetPlatformLog(), "MpiShutdown: pthread_cancel failed with %d", status);
+        pthread_join(g_mpiServerWorker, NULL);
     }
 
     UnloadModules();