Changeset 179809 in webkit

Timestamp:

Feb 8, 2015, 4:30:46 PM (12 years ago)

Author:

timothy_horton@apple.com

Message:

Null deref in _clearImmediateActionState when closing a view with a DataDetectors popover open
​https://bugs.webkit.org/show_bug.cgi?id=141377
<rdar://problem/19711203>

Reviewed by Darin Adler.

• UIProcess/mac/WKImmediateActionController.mm:

(-[WKImmediateActionController _clearImmediateActionState]):
We can have already detached the page when DataDetectors calls us back
in interactionStoppedHandler. While we have kept a strong reference to the
page in the interactionStoppedHandler block, _page is nulled out.
It's OK to avoid doing this work, in any case, because closing a page
tears down the TextIndicator anyway.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/mac/WKImmediateActionController.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-02-08  Timothy Horton  <timothy_horton@apple.com>
+
+        Null deref in _clearImmediateActionState when closing a view with a DataDetectors popover open
+        https://bugs.webkit.org/show_bug.cgi?id=141377
+        <rdar://problem/19711203>
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/mac/WKImmediateActionController.mm:
+        (-[WKImmediateActionController _clearImmediateActionState]):
+        We can have already detached the page when DataDetectors calls us back
+        in interactionStoppedHandler. While we have kept a strong reference to the
+        page in the interactionStoppedHandler block, _page is nulled out.
+        It's OK to avoid doing this work, in any case, because closing a page
+        tears down the TextIndicator anyway.
+
 2015-02-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm

@@ -116 +116 @@
 - (void)_clearImmediateActionState
 {
-    _page->clearTextIndicator();
+    if (_page)
+        _page->clearTextIndicator();
 
     if (_currentActionContext && _hasActivatedActionContext) {