epicsThread avoid possible data race on joined

2019-07-08 10:34:53 -07:00
parent ee1eac3f4c
commit f134abb84e
1 changed files with 7 additions and 5 deletions
--- a/modules/libcom/src/osi/epicsThread.cpp
+++ b/modules/libcom/src/osi/epicsThread.cpp
@@ -153,11 +153,13 @@ bool epicsThread::exitWait ( const double delay ) throw ()
            if ( this->pThreadDestroyed ) {
                *this->pThreadDestroyed = true;
            }
-            if(!joined) {
-                {
-                    epicsGuard < epicsMutex > guard ( this->mutex );
-                    joined = true;
-                }
+            bool j;
+            {
+                epicsGuard < epicsMutex > guard ( this->mutex );
+                j = joined;
+                joined = true;
+            }
+            if(!j) {
                epicsThreadMustJoin(this->id);
            }
            return true;