Changeset 294849 in webkit

Timestamp:

May 25, 2022, 4:50:11 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick 589c2b5478bb. rdar://problem/92780272

Apply patch. rdar://problem/92780272

Canonical link: ​https://commits.webkit.org/245886.563@safari-7613.3.1.1-branch
git-svn-id: ​https://svn.webkit.org/repository/webkit/branches/safari-7613.3.1.1-branch@294055 268f45cc-cd09-0410-ab3c-d52691b4dbfc

File:

• branches/safari-613-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm (modified) (3 diffs)

branches/safari-613-branch/Source/WebKit/UIProcess/WebAuthentication/Cocoa/WebAuthenticatorCoordinatorProxy.mm

@@ -379 +379 @@
     m_proxy = adoptNS([allocASCAgentProxyInstance() init]);
 #if PLATFORM(IOS)
-    [m_proxy performAuthorizationRequestsForContext:requestContext.get() withCompletionHandler:makeBlockPtr([handler = WTFMove(handler)](id<ASCCredentialProtocol> credential, NSError *error) mutable {
-        callOnMainRunLoop([handler = WTFMove(handler), proxy = WTFMove(proxy), credential = retainPtr(credential), error = retainPtr(error)] () mutable {
+    [m_proxy performAuthorizationRequestsForContext:requestContext.get() withCompletionHandler:makeBlockPtr([weakThis = WeakPtr { *this }, handler = WTFMove(handler)](id<ASCCredentialProtocol> credential, NSError *error) mutable {
+        callOnMainRunLoop([weakThis, handler = WTFMove(handler), proxy = WTFMove(proxy), credential = retainPtr(credential), error = retainPtr(error)] () mutable {
 #elif PLATFORM(MAC)
     RetainPtr<NSWindow> window = m_webPageProxy.platformWindow();
@@ -388 +388 @@
                 LOG_ERROR("Could not connect to authorization daemon: %@\n", error.get());
                 handler({ }, (AuthenticatorAttachment)0, ExceptionData { NotAllowedError, "Operation failed." });
+                if (weakThis)
+                    weakThis->m_proxy.clear();
                 return;
             }
 
             weakThis->m_presenter = adoptNS([allocASCAuthorizationRemotePresenterInstance() init]);
-            [weakThis->m_presenter presentWithWindow:window.get() daemonEndpoint:daemonEndpoint.get() completionHandler:makeBlockPtr([handler = WTFMove(handler)](id<ASCCredentialProtocol> credentialNotRetain, NSError *errorNotRetain) mutable {
+            [weakThis->m_presenter presentWithWindow:window.get() daemonEndpoint:daemonEndpoint.get() completionHandler:makeBlockPtr([weakThis, handler = WTFMove(handler)](id<ASCCredentialProtocol> credentialNotRetain, NSError *errorNotRetain) mutable {
                 auto credential = retainPtr(credentialNotRetain);
                 auto error = retainPtr(errorNotRetain);
 #endif
                 continueAfterRequest(credential, error, WTFMove(handler));
+                weakThis->m_proxy.clear();
 #if PLATFORM(MAC)
             }).get()];
@@ -416 +419 @@
 void WebAuthenticatorCoordinatorProxy::cancel()
 {
-    if (m_proxy)
+    if (m_proxy) {
         [m_proxy cancelCurrentRequest];
+        m_proxy.clear();
+    }
 }