Changeset 49814 in webkit

Timestamp:

Oct 19, 2009 3:00:12 PM (15 years ago)

Author:

Adam Roben

Message:

Fix crashes/assertions when calling WebLocalizedString from multiple threads concurrently

Fixes <​http://webkit.org/b/30534> WebLocalizedString asserts if called
from multiple threads concurrently

Reviewed by John Sullivan.

• WebLocalizableStrings.cpp:

(mainBundleLocStringsMutex):
(frameworkLocStringsMutex):
Added these new getters.

(findCachedString):
(cacheString):
Lock the relevant mutex before accessing each string map. Otherwise
bad things could happen if two threads end up here at the same time.

Location:

trunk/WebKit/win

Files:

• ChangeLog (modified) (1 diff)
• WebLocalizableStrings.cpp (modified) (3 diffs)

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2009-10-19  Adam Roben  <aroben@apple.com>
+
+        Fix crashes/assertions when calling WebLocalizedString from multiple
+        threads concurrently
+
+        Fixes <http://webkit.org/b/30534> WebLocalizedString asserts if called
+        from multiple threads concurrently
+
+        Reviewed by John Sullivan.
+
+        * WebLocalizableStrings.cpp:
+        (mainBundleLocStringsMutex):
+        (frameworkLocStringsMutex):
+        Added these new getters.
+
+        (findCachedString):
+        (cacheString):
+        Lock the relevant mutex before accessing each string map. Otherwise
+        bad things could happen if two threads end up here at the same time.
+
 2009-10-19  Adam Roben  <aroben@apple.com>
 

trunk/WebKit/win/WebLocalizableStrings.cpp

@@ -49 +49 @@
 typedef HashMap<String, LocalizedString*> LocalizedStringMap;
 
+static Mutex& mainBundleLocStringsMutex()
+{
+    DEFINE_STATIC_LOCAL(Mutex, mutex, ());
+    return mutex;
+}
+
 static LocalizedStringMap& mainBundleLocStrings()
 {
     DEFINE_STATIC_LOCAL(LocalizedStringMap, map, ());
     return map;
+}
+
+static Mutex& frameworkLocStringsMutex()
+{
+    DEFINE_STATIC_LOCAL(Mutex, mutex, ());
+    return mutex;
 }
 
@@ -169 +181 @@
 static LocalizedString* findCachedString(WebLocalizableStringsBundle* stringsBundle, const String& key)
 {
-    if (!stringsBundle)
+    if (!stringsBundle) {
+        MutexLocker lock(mainBundleLocStringsMutex());
         return mainBundleLocStrings().get(key);
-
-    if (stringsBundle->bundle == WebKitLocalizableStringsBundle.bundle)
+    }
+
+    if (stringsBundle->bundle == WebKitLocalizableStringsBundle.bundle) {
+        MutexLocker lock(frameworkLocStringsMutex());
         return frameworkLocStrings().get(key);
+    }
 
     return 0;
@@ -181 +197 @@
 {
     if (!stringsBundle) {
+        MutexLocker lock(mainBundleLocStringsMutex());
         mainBundleLocStrings().set(key, value);
         return;
     }
 
+    MutexLocker lock(frameworkLocStringsMutex());
     frameworkLocStrings().set(key, value);
 }