Changeset 171225 in webkit

Timestamp:

Jul 18, 2014 10:21:20 AM (10 years ago)

Author:

jhoneycutt@apple.com

Message:

REGRESSION: Crash when typing into text field that clears itself on iOS

<​https://bugs.webkit.org/show_bug.cgi?id=135044>
<rdar://problem/17640443>

Reviewed by Darin Adler.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::requestAutocorrectionData):
wordRangeFromPosition() returns null in some cases; null check range
before dereferencing it. Moved some variable declarations around to
better match our style.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/ios/WebPageIOS.mm (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-18  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        REGRESSION: Crash when typing into text field that clears itself on iOS
+
+        <https://bugs.webkit.org/show_bug.cgi?id=135044>
+        <rdar://problem/17640443>
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::requestAutocorrectionData):
+        wordRangeFromPosition() returns null in some cases; null check range
+        before dereferencing it. Moved some variable declarations around to
+        better match our style.
+
 2014-07-18  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -1621 +1621 @@
 void WebPage::requestAutocorrectionData(const String& textForAutocorrection, uint64_t callbackID)
 {
-    RefPtr<Range> range;
     Frame& frame = m_page->focusController().focusedOrMainFrame();
     if (!frame.selection().isCaret()) {
@@ -1629 +1628 @@
 
     VisiblePosition position = frame.selection().selection().start();
-    Vector<SelectionRect> selectionRects;
-
-    range = wordRangeFromPosition(position);
+    RefPtr<Range> range = wordRangeFromPosition(position);
+    if (!range) {
+        send(Messages::WebPageProxy::AutocorrectionDataCallback(Vector<FloatRect>(), String(), 0, 0, callbackID));
+        return;
+    }
+
     String textForRange = plainTextReplacingNoBreakSpace(range.get());
     const unsigned maxSearchAttempts = 5;
@@ -1642 +1644 @@
         textForRange = plainTextReplacingNoBreakSpace(range.get());
     }
+
+    Vector<SelectionRect> selectionRects;
     if (textForRange == textForAutocorrection)
         range->collectSelectionRects(selectionRects);