Changeset 58393 in webkit

Timestamp:

Apr 28, 2010 2:06:20 AM (14 years ago)

Author:

Simon Hausmann

Message:

JSC's currentThreadStackBase is not reentrant on some platforms
​https://bugs.webkit.org/show_bug.cgi?id=37195

Patch by Simon Hausmann <​simon.hausmann@nokia.com>, Kent Hansen <​kent.hansen@nokia.com> on 2010-04-28
Reviewed by Darin Adler.

This function needs to be reentrant to avoid memory corruption on platforms where
the implementation uses global variables.

This patch adds a mutex lock where necessary and makes the Symbian implementation
reentrant.

• runtime/Collector.cpp:

(JSC::currentThreadStackBaseMutex):
(JSC::currentThreadStackBase):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/Collector.cpp (modified) (4 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-04-28  Simon Hausmann  <simon.hausmann@nokia.com>, Kent Hansen <kent.hansen@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        JSC's currentThreadStackBase is not reentrant on some platforms
+        https://bugs.webkit.org/show_bug.cgi?id=37195
+
+        This function needs to be reentrant to avoid memory corruption on platforms where
+        the implementation uses global variables.
+
+        This patch adds a mutex lock where necessary and makes the Symbian implementation
+        reentrant.
+
+        * runtime/Collector.cpp:
+        (JSC::currentThreadStackBaseMutex):
+        (JSC::currentThreadStackBase):
+
 2010-04-28  Thiago Macieira <thiago.macieira@nokia.com>
 

trunk/JavaScriptCore/runtime/Collector.cpp

@@ -559 +559 @@
     return reinterpret_cast<void*>(pTib->StackBase);
 #elif OS(QNX)
+    AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
+    MutexLocker locker(mutex);
     return currentThreadStackBaseQNX();
 #elif OS(SOLARIS)
@@ -570 +572 @@
     return stack.ss_sp;
 #elif OS(SYMBIAN)
-    static void* stackBase = 0;
-    if (stackBase == 0) {
-        TThreadStackInfo info;
-        RThread thread;
-        thread.StackInfo(info);
-        stackBase = (void*)info.iBase;
-    }
-    return (void*)stackBase;
+    TThreadStackInfo info;
+    RThread thread;
+    thread.StackInfo(info);
+    return (void*)info.iBase;
 #elif OS(HAIKU)
     thread_info threadInfo;
@@ -583 +581 @@
     return threadInfo.stack_end;
 #elif OS(UNIX)
+    AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
+    MutexLocker locker(mutex);
     static void* stackBase = 0;
     static size_t stackSize = 0;
@@ -605 +605 @@
     return static_cast<char*>(stackBase) + stackSize;
 #elif OS(WINCE)
+    AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex);
+    MutexLocker locker(mutex);
     if (g_stackBase)
         return g_stackBase;