Changeset 196774 in webkit

Timestamp:

Feb 18, 2016 1:30:23 PM (8 years ago)

Author:

BJ Burg

Message:

RemoteInspector deadlocks if _WKAutomationDelegate creates/registers a target synchronously
​https://bugs.webkit.org/show_bug.cgi?id=154359
<rdar://problem/24708897>

Reviewed by Joseph Pecoraro.

• UIProcess/Cocoa/AutomationClient.mm:

(WebKit::AutomationClient::requestAutomationSession):
Make an NSString out of the String reference so it gets captured correctly.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/AutomationClient.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-02-18  Brian Burg  <bburg@apple.com>
+
+        RemoteInspector deadlocks if _WKAutomationDelegate creates/registers a target synchronously
+        https://bugs.webkit.org/show_bug.cgi?id=154359
+        <rdar://problem/24708897>
+
+        Reviewed by Joseph Pecoraro.
+
+        * UIProcess/Cocoa/AutomationClient.mm:
+        (WebKit::AutomationClient::requestAutomationSession):
+        Make an NSString out of the String reference so it gets captured correctly.
+
 2016-02-18  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/UIProcess/Cocoa/AutomationClient.mm

@@ -73 +73 @@
     // RemoteInspector will try to acquire its lock to register the new session and
     // deadlock because it's already taken while handling XPC messages.
+
+    NSString *retainedIdentifier = sessionIdentifier;
     dispatch_async(dispatch_get_main_queue(), ^{
         if (m_delegateMethods.requestAutomationSession)
-            [m_delegate.get() _processPool:m_processPool didRequestAutomationSessionWithIdentifier:sessionIdentifier];
+            [m_delegate.get() _processPool:m_processPool didRequestAutomationSessionWithIdentifier:retainedIdentifier];
     });
 }