Changeset 34256 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Nov 22, 2010 3:55:00 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68004

Message:

IPRT: Must clear the TLS entry holding RTTHREAD before freeing the structure or the electric fence heap may cause a crash when blocking.

Location:

trunk/src/VBox/Runtime/r3

Files:

• os2/thread-os2.cpp (modified) (1 diff)
• posix/thread-posix.cpp (modified) (2 diffs)
• win/thread-win.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/os2/thread-os2.cpp

@@ -95 +95 @@
 
 
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    if (pThread == *g_ppCurThread)
+        *g_ppCurThread = NULL;
+}
+
+
 /**
  * Wrapper which unpacks the params and calls thread function.

trunk/src/VBox/Runtime/r3/posix/thread-posix.cpp

@@ -204 +204 @@
 
 
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    if (pThread == (PRTTHREADINT)pthread_getspecific(g_SelfKey))
+        pthread_setspecific(g_SelfKey, NULL);
+}
+
+
 /**
  * Wrapper which unpacks the params and calls thread function.
@@ -243 +250 @@
     rc = rtThreadMain(pThread, (uintptr_t)Self, &pThread->szName[0]);
 
-    pthread_setspecific(g_SelfKey, NULL);
     pthread_exit((void *)rc);
     return (void *)rc;

trunk/src/VBox/Runtime/r3/win/thread-win.cpp

@@ -78 +78 @@
         TlsSetValue(g_dwSelfTLS, NULL);
     }
+}
+
+
+void rtThreadNativeDestroy(PRTTHREADINT pThread)
+{
+    if (pThread == (PRTTHREADINT)TlsGetValue(g_dwSelfTLS))
+        TlsSetValue(g_dwSelfTLS, NULL);
 }