Title: [179809] trunk/Source/WebKit2
- Revision
- 179809
- Author
- [email protected]
- Date
- 2015-02-08 16:30:46 -0800 (Sun, 08 Feb 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (179808 => 179809)
--- trunk/Source/WebKit2/ChangeLog 2015-02-08 23:40:01 UTC (rev 179808)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-09 00:30:46 UTC (rev 179809)
@@ -1,3 +1,19 @@
+2015-02-08 Timothy Horton <[email protected]>
+
+ 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 <[email protected]>
[WK2] Add logging to validate the network cache efficacy (Part 1)
Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (179808 => 179809)
--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-02-08 23:40:01 UTC (rev 179808)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2015-02-09 00:30:46 UTC (rev 179809)
@@ -115,7 +115,8 @@
- (void)_clearImmediateActionState
{
- _page->clearTextIndicator();
+ if (_page)
+ _page->clearTextIndicator();
if (_currentActionContext && _hasActivatedActionContext) {
_hasActivatedActionContext = NO;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
