Title: [175854] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 175854
- Author
- matthew_han...@apple.com
- Date
- 2014-11-10 23:43:04 -0800 (Mon, 10 Nov 2014)
Log Message
Merged r175702. rdar://problems/18872825
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (175853 => 175854)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-11 07:38:01 UTC (rev 175853)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-11 07:43:04 UTC (rev 175854)
@@ -1,5 +1,22 @@
2014-11-10 Matthew Hanson <matthew_han...@apple.com>
+ Merge r175702. <rdar://problem/18872825>
+
+ 2014-11-06 Tim Horton <timothy_hor...@apple.com>
+
+ Null deref in rangeForDictionaryLookupAtHitTestResult on occasion
+ https://bugs.webkit.org/show_bug.cgi?id=138459
+ <rdar://problem/18872825>
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::rangeForDictionaryLookupAtHitTestResult):
+ rangeExpandedAroundPositionByCharacters can return null.
+
+
+2014-11-10 Matthew Hanson <matthew_han...@apple.com>
+
Merge r175701. <rdar://problem/18768377>
2014-11-06 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (175853 => 175854)
--- branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-11 07:38:01 UTC (rev 175853)
+++ branches/safari-600.3-branch/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2014-11-11 07:43:04 UTC (rev 175854)
@@ -572,6 +572,9 @@
// As context, we are going to use 250 characters of text before and after the point.
RefPtr<Range> fullCharacterRange = rangeExpandedAroundPositionByCharacters(position, 250);
+ if (!fullCharacterRange)
+ return nullptr;
+
NSRange rangeToPass = NSMakeRange(TextIterator::rangeLength(makeRange(fullCharacterRange->startPosition(), position).get()), 0);
String fullPlainTextString = plainText(fullCharacterRange.get());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
