Changeset 242732 in webkit

Timestamp:

Mar 11, 2019, 1:06:55 PM (7 years ago)

Author:

sihui_liu@apple.com

Message:

Crash under WebCore::IDBDatabase::connectionToServerLost
​https://bugs.webkit.org/show_bug.cgi?id=195563
<rdar://problem/37193655>

CrossThreadTask should protect callee if it is ThreadSafeRefCounted.

Reviewed by Geoffrey Garen.

• wtf/CrossThreadTask.h:

(WTF::createCrossThreadTask):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/CrossThreadTask.h (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-03-11  Sihui Liu  <sihui_liu@apple.com>
+
+        Crash under WebCore::IDBDatabase::connectionToServerLost
+        https://bugs.webkit.org/show_bug.cgi?id=195563
+        <rdar://problem/37193655>
+
+        CrossThreadTask should protect callee if it is ThreadSafeRefCounted.
+
+        Reviewed by Geoffrey Garen.
+
+        * wtf/CrossThreadTask.h:
+        (WTF::createCrossThreadTask):
+
 2019-03-11  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WTF/wtf/CrossThreadTask.h

@@ -28 +28 @@
 #include <wtf/CrossThreadCopier.h>
 #include <wtf/Function.h>
+#include <wtf/RefPtr.h>
 #include <wtf/StdLibExtras.h>
+#include <wtf/ThreadSafeRefCounted.h>
 
 namespace WTF {
@@ -83 +85 @@
 }
 
-template<typename T, typename... Parameters, typename... Arguments>
+template<typename T, typename std::enable_if<std::is_base_of<ThreadSafeRefCounted<T>, T>::value, int>::type = 0, typename... Parameters, typename... Arguments>
+CrossThreadTask createCrossThreadTask(T& callee, void (T::*method)(Parameters...), const Arguments&... arguments)
+{
+    return CrossThreadTask([callee = makeRefPtr(&callee), method, arguments = std::make_tuple(crossThreadCopy<Arguments>(arguments)...)]() mutable {
+        callMemberFunctionForCrossThreadTask(callee.get(), method, WTFMove(arguments));
+    });
+}
+
+template<typename T, typename std::enable_if<!std::is_base_of<ThreadSafeRefCounted<T>, T>::value, int>::type = 0, typename... Parameters, typename... Arguments>
 CrossThreadTask createCrossThreadTask(T& callee, void (T::*method)(Parameters...), const Arguments&... arguments)
 {