Title: [193489] trunk/Source/WebKit2
- Revision
- 193489
- Author
- bda...@apple.com
- Date
- 2015-12-04 16:53:03 -0800 (Fri, 04 Dec 2015)
Log Message
Crash in clients using userData in
_immediateActionAnimationControllerForHitTestResult
https://bugs.webkit.org/show_bug.cgi?id=151887
Rubber-stamped by Anders Carlsson.
Follow-up fix to handle null userData.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _web_immediateActionAnimationControllerForHitTestResultInternal:withType:userData:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (193488 => 193489)
--- trunk/Source/WebKit2/ChangeLog 2015-12-05 00:42:28 UTC (rev 193488)
+++ trunk/Source/WebKit2/ChangeLog 2015-12-05 00:53:03 UTC (rev 193489)
@@ -4,6 +4,18 @@
_immediateActionAnimationControllerForHitTestResult
https://bugs.webkit.org/show_bug.cgi?id=151887
+ Rubber-stamped by Anders Carlsson.
+
+ Follow-up fix to handle null userData.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _web_immediateActionAnimationControllerForHitTestResultInternal:withType:userData:]):
+
+2015-12-04 Beth Dakin <bda...@apple.com>
+
+ Crash in clients using userData in
+ _immediateActionAnimationControllerForHitTestResult
+ https://bugs.webkit.org/show_bug.cgi?id=151887
+
Reviewed by Sam Weinig.
Cast this correctly.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (193488 => 193489)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-05 00:42:28 UTC (rev 193488)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-12-05 00:53:03 UTC (rev 193489)
@@ -2771,7 +2771,8 @@
- (id)_web_immediateActionAnimationControllerForHitTestResultInternal:(API::HitTestResult*)hitTestResult withType:(uint32_t)type userData:(API::Object*)userData
{
- return [self _immediateActionAnimationControllerForHitTestResult:wrapper(*hitTestResult) withType:(_WKImmediateActionType)type userData:static_cast<id<NSSecureCoding>>(userData->wrapper())];
+ id<NSSecureCoding> data = "" ? static_cast<id<NSSecureCoding>>(userData->wrapper()) : nil;
+ return [self _immediateActionAnimationControllerForHitTestResult:wrapper(*hitTestResult) withType:(_WKImmediateActionType)type userData:data];
}
// We don't expose these various bits of SPI like WKView does,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
