Changeset 263869 in webkit

Timestamp:

Jul 2, 2020, 3:43:59 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Crash in +[UIViewController _viewControllerForFullScreenPresentationFromView:] when WKContentView is deallocated
​https://bugs.webkit.org/show_bug.cgi?id=213867

Patch by Austin Blackwood <​ablackwoood@apple.com> on 2020-07-02
Reviewed by Darin Adler.

+[UIViewController _viewControllerForFullScreenPresentationFromView:]
asserts that the view parameter is non-nil. WKFileUploadPanel
passes its view (a weak pointer to the WKContentView), which may
have already been nil'd out when the content view tries to dismiss
the panel in its own dealloc.

• UIProcess/ios/forms/WKFileUploadPanel.mm:

(-[WKFileUploadPanel dismiss]):
Check for nil.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/forms/WKFileUploadPanel.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-07-02  Austin Blackwood  <ablackwoood@apple.com>
+
+        Crash in +[UIViewController _viewControllerForFullScreenPresentationFromView:] when WKContentView is deallocated
+        https://bugs.webkit.org/show_bug.cgi?id=213867
+
+        Reviewed by Darin Adler.
+
+        +[UIViewController _viewControllerForFullScreenPresentationFromView:]
+        asserts that the view parameter is non-nil. WKFileUploadPanel
+        passes its view (a weak pointer to the WKContentView), which may
+        have already been nil'd out when the content view tries to dismiss
+        the panel in its own dealloc.
+
+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
+        (-[WKFileUploadPanel dismiss]):
+        Check for nil.
+
 2020-07-02  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm

@@ -284 +284 @@
     // Dismiss any view controller that is being presented. This works for all types of view controllers, popovers, etc.
     // If there is any kind of view controller presented on this view, it will be removed.
-    
-    [[UIViewController _viewControllerForFullScreenPresentationFromView:_view.getAutoreleased()] dismissViewControllerAnimated:NO completion:nil];
+
+    if (auto view = _view.get())
+        [[UIViewController _viewControllerForFullScreenPresentationFromView:view.get()] dismissViewControllerAnimated:NO completion:nil];
     
     [_presentationPopover setDelegate:nil];
     _presentationPopover = nil;
     _presentationViewController = nil;
-    
+
     [self _cancel];
 }