Changeset 290128 in webkit

Timestamp:

Feb 18, 2022, 8:41:41 AM (5 years ago)

Author:

Tyler Wilcock

Message:

AX: isAXAuthenticatedCallback must be handled on the main runloop
​https://bugs.webkit.org/show_bug.cgi?id=236789

Reviewed by Chris Fleizach.

isAXAuthenticatedCallback in WebProcessCocoa.mm performs IPC to the UI process
to determine if the given auditToken is valid. This causes a crash with isolated
tree mode enabled as IPC must be performed on the main thread / runloop.

This patch changes this function to dispatch to the main runloop.

• WebProcess/cocoa/WebProcessCocoa.mm:

(WebKit::isAXAuthenticatedCallback):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/cocoa/WebProcessCocoa.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-02-18  Tyler Wilcock  <tyler_w@apple.com>
+
+        AX: isAXAuthenticatedCallback must be handled on the main runloop
+        https://bugs.webkit.org/show_bug.cgi?id=236789
+
+        Reviewed by Chris Fleizach.
+
+        isAXAuthenticatedCallback in WebProcessCocoa.mm performs IPC to the UI process
+        to determine if the given auditToken is valid. This causes a crash with isolated
+        tree mode enabled as IPC must be performed on the main thread / runloop.
+
+        This patch changes this function to dispatch to the main runloop.
+
+        * WebProcess/cocoa/WebProcessCocoa.mm:
+        (WebKit::isAXAuthenticatedCallback):
+
 2022-02-18  Saam Barati  <sbarati@apple.com>
 

trunk/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm

@@ -225 +225 @@
 {
     bool authenticated = false;
-    WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::IsAXAuthenticated(auditToken), Messages::WebProcessProxy::IsAXAuthenticated::Reply(authenticated), 0);
+    // IPC must be done on the main runloop, so dispatch it to avoid crashes when the secondary AX thread handles this callback.
+    callOnMainRunLoopAndWait([&authenticated, auditToken] {
+        WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebProcessProxy::IsAXAuthenticated(auditToken), Messages::WebProcessProxy::IsAXAuthenticated::Reply(authenticated), 0);
+    });
     return authenticated;
 }