Title: [244781] trunk/Source/WebKit
- Revision
- 244781
- Author
- [email protected]
- Date
- 2019-04-30 10:37:47 -0700 (Tue, 30 Apr 2019)
Log Message
Long-standing rare crash under -[WKWebView _web_immediateActionAnimationControllerForHitTestResultInternal...]
https://bugs.webkit.org/show_bug.cgi?id=197404
<rdar://problem/24589331>
Reviewed by Wenson Hsieh.
* UIProcess/mac/WKImmediateActionController.mm:
(-[WKImmediateActionController _updateImmediateActionItem]):
(-[WKImmediateActionController menuItem:previewItemAtPoint:]):
(-[WKImmediateActionController menuItem:itemFrameForPoint:]):
(-[WKImmediateActionController _animationControllerForDataDetectedLink]):
Add some null checks; _webHitTestResult can be null if we (somehow) get
an immediate action gesture without having previously gotten a
mouseDidMoveOverElement from the Web Content process. Cover all our bases.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (244780 => 244781)
--- trunk/Source/WebKit/ChangeLog 2019-04-30 17:08:54 UTC (rev 244780)
+++ trunk/Source/WebKit/ChangeLog 2019-04-30 17:37:47 UTC (rev 244781)
@@ -1,3 +1,20 @@
+2019-04-30 Tim Horton <[email protected]>
+
+ Long-standing rare crash under -[WKWebView _web_immediateActionAnimationControllerForHitTestResultInternal...]
+ https://bugs.webkit.org/show_bug.cgi?id=197404
+ <rdar://problem/24589331>
+
+ Reviewed by Wenson Hsieh.
+
+ * UIProcess/mac/WKImmediateActionController.mm:
+ (-[WKImmediateActionController _updateImmediateActionItem]):
+ (-[WKImmediateActionController menuItem:previewItemAtPoint:]):
+ (-[WKImmediateActionController menuItem:itemFrameForPoint:]):
+ (-[WKImmediateActionController _animationControllerForDataDetectedLink]):
+ Add some null checks; _webHitTestResult can be null if we (somehow) get
+ an immediate action gesture without having previously gotten a
+ mouseDidMoveOverElement from the Web Content process. Cover all our bases.
+
2019-04-30 Per Arne Vollan <[email protected]>
[iOS] Fix crash caused by sandbox violation
Modified: trunk/Source/WebKit/UIProcess/mac/WKImmediateActionController.mm (244780 => 244781)
--- trunk/Source/WebKit/UIProcess/mac/WKImmediateActionController.mm 2019-04-30 17:08:54 UTC (rev 244780)
+++ trunk/Source/WebKit/UIProcess/mac/WKImmediateActionController.mm 2019-04-30 17:37:47 UTC (rev 244781)
@@ -328,6 +328,11 @@
}
RefPtr<API::HitTestResult> hitTestResult = [self _webHitTestResult];
+ if (!hitTestResult) {
+ [self _cancelImmediateAction];
+ return;
+ }
+
id customClientAnimationController = _page->immediateActionAnimationControllerForHitTestResult(hitTestResult, _type, _userData);
if (customClientAnimationController == [NSNull null]) {
[self _cancelImmediateAction];
@@ -353,6 +358,9 @@
return nil;
RefPtr<API::HitTestResult> hitTestResult = [self _webHitTestResult];
+ if (!hitTestResult)
+ return nil;
+
return [NSURL _web_URLWithWTFString:hitTestResult->absoluteLinkURL()];
}
@@ -372,6 +380,9 @@
return NSZeroRect;
RefPtr<API::HitTestResult> hitTestResult = [self _webHitTestResult];
+ if (!hitTestResult)
+ return NSZeroRect;
+
return [_view convertRect:hitTestResult->elementBoundingBox() toView:nil];
}
@@ -449,6 +460,9 @@
[_currentActionContext setHighlightFrame:[_view.window convertRectToScreen:[_view convertRect:_hitTestResultData.elementBoundingBox toView:nil]]];
RefPtr<API::HitTestResult> hitTestResult = [self _webHitTestResult];
+ if (!hitTestResult)
+ return nil;
+
NSArray *menuItems = [[getDDActionsManagerClass() sharedManager] menuItemsForTargetURL:hitTestResult->absoluteLinkURL() actionContext:_currentActionContext.get()];
if (menuItems.count != 1)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
