Title: [175354] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175354
- Author
- [email protected]
- Date
- 2014-10-29 16:18:36 -0700 (Wed, 29 Oct 2014)
Log Message
Merge r175353. rdar://problem/18817803
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175353 => 175354)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 23:13:15 UTC (rev 175353)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-10-29 23:18:36 UTC (rev 175354)
@@ -1,5 +1,21 @@
2014-10-29 Matthew Hanson <[email protected]>
+ Merge r175353. rdar://problem/18817803
+
+ 2014-10-29 Tim Horton <[email protected]>
+
+ Null deref under performActionMenuHitTestAtLocation
+ https://bugs.webkit.org/show_bug.cgi?id=138197
+ <rdar://problem/18817803>
+
+ Reviewed by Beth Dakin.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::scanForDataDetectedItems):
+ Null-check the expanded range.
+
+2014-10-29 Matthew Hanson <[email protected]>
+
Rollout r174369. <rdar://problem/18640842>
2014-10-06 Chris Dumez <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (175353 => 175354)
--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-10-29 23:13:15 UTC (rev 175353)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-10-29 23:18:36 UTC (rev 175354)
@@ -1067,6 +1067,9 @@
position = firstPositionInOrBeforeNode(node);
RefPtr<Range> contextRange = rangeExpandedAroundPosition(position, 4);
+ if (!contextRange)
+ return nullptr;
+
String fullPlainTextString = plainText(contextRange.get());
int hitLocation = TextIterator::rangeLength(makeRange(contextRange->startPosition(), position).get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
