Changeset 193489 in webkit

Timestamp:

Dec 4, 2015, 4:53:03 PM (10 years ago)

Author:

Beth Dakin

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:]):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-12-04  Beth Dakin  <bdakin@apple.com>
+
+        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:]):
+
 2015-12-04  Beth Dakin  <bdakin@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -2772 +2772 @@
 - (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 = userData ? static_cast<id<NSSecureCoding>>(userData->wrapper()) : nil;
+    return [self _immediateActionAnimationControllerForHitTestResult:wrapper(*hitTestResult) withType:(_WKImmediateActionType)type userData:data];
 }