Changeset 284896 in webkit

Timestamp:

Oct 26, 2021, 2:13:02 PM (5 years ago)

Author:

Brent Fulgham

Message:

[AppSSO] Avoid attempting to display a nil view controller
​https://bugs.webkit.org/show_bug.cgi?id=232311
<rdar://problem/55199117>

Reviewed by Kate Cheney.

Avoid attempting to present a nil NSViewController. Instead, just treat the interaction as if
the authentication was cancelled.

• UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.mm:

(-[WKSOAuthorizationDelegate authorization:presentViewController:withCompletion:]):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-10-26  Brent Fulgham  <bfulgham@apple.com>
+
+        [AppSSO] Avoid attempting to display a nil view controller
+        https://bugs.webkit.org/show_bug.cgi?id=232311
+        <rdar://problem/55199117>
+
+        Reviewed by Kate Cheney.
+
+        Avoid attempting to present a nil NSViewController. Instead, just treat the interaction as if
+        the authentication was cancelled.
+
+        * UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.mm:
+        (-[WKSOAuthorizationDelegate authorization:presentViewController:withCompletion:]):
+
 2021-10-26  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/SOAuthorization/WKSOAuthorizationDelegate.mm

@@ -47 +47 @@
         return;
     }
+
+    if (!viewController) {
+        WKSOAUTHORIZATIONDELEGATE_RELEASE_LOG("authorization: No view controller to present, so completing with NO as success state.");
+        completion(NO, nil);
+        return;
+    }
+
     WKSOAUTHORIZATIONDELEGATE_RELEASE_LOG("authorization: presentingViewController %p", viewController);
     _session->presentViewController(viewController, completion);