Title: [171577] trunk/Source/WebCore
- Revision
- 171577
- Author
- [email protected]
- Date
- 2014-07-24 20:12:19 -0700 (Thu, 24 Jul 2014)
Log Message
Crashes under scanSelectionForTelephoneNumbers in Range::text() on some sites
https://bugs.webkit.org/show_bug.cgi?id=135281
<rdar://problem/17803347>
Reviewed by Ryosuke Niwa.
* editing/Editor.cpp:
(WebCore::Editor::scanSelectionForTelephoneNumbers):
toNormalizedRange is not guaranteed to return a non-null range.
If it returns null, pass the empty markedRanges down to the client as our new set.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (171576 => 171577)
--- trunk/Source/WebCore/ChangeLog 2014-07-25 03:00:57 UTC (rev 171576)
+++ trunk/Source/WebCore/ChangeLog 2014-07-25 03:12:19 UTC (rev 171577)
@@ -1,3 +1,16 @@
+2014-07-24 Tim Horton <[email protected]>
+
+ Crashes under scanSelectionForTelephoneNumbers in Range::text() on some sites
+ https://bugs.webkit.org/show_bug.cgi?id=135281
+ <rdar://problem/17803347>
+
+ Reviewed by Ryosuke Niwa.
+
+ * editing/Editor.cpp:
+ (WebCore::Editor::scanSelectionForTelephoneNumbers):
+ toNormalizedRange is not guaranteed to return a non-null range.
+ If it returns null, pass the empty markedRanges down to the client as our new set.
+
2014-07-24 Dan Bernstein <[email protected]>
WebCore part of <rdar://problem/17593701> Assertion failure in WebPage::reload (!m_pendingNavigationID) when reloading after a same-document back navigation
Modified: trunk/Source/WebCore/editing/Editor.cpp (171576 => 171577)
--- trunk/Source/WebCore/editing/Editor.cpp 2014-07-25 03:00:57 UTC (rev 171576)
+++ trunk/Source/WebCore/editing/Editor.cpp 2014-07-25 03:12:19 UTC (rev 171577)
@@ -3393,6 +3393,11 @@
extendedSelection.setEnd(end);
RefPtr<Range> extendedRange = extendedSelection.toNormalizedRange();
+ if (!extendedRange) {
+ client()->selectedTelephoneNumberRangesChanged(markedRanges);
+ return;
+ }
+
scanRangeForTelephoneNumbers(*extendedRange, extendedRange->text(), markedRanges);
// Only consider ranges with a detected telephone number if they overlap with the actual selection range.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
