Title: [177115] trunk
Revision
177115
Author
jhoneyc...@apple.com
Date
2014-12-10 17:10:02 -0800 (Wed, 10 Dec 2014)

Log Message

Null dereference performing a "TapAndAHalf" gesture in Google search field

<https://bugs.webkit.org/show_bug.cgi?id=139506>
<rdar://problem/19028828>

Reviewed by Darin Adler.

.:

* ManualTests/ios/tap-and-a-half-gesture-in-empty-text-field.html: Added.

Source/WebKit2:

* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::selectWithGesture):
Add a null check in the case that there is no word range for the
current position.

Modified Paths

Added Paths

Diff

Modified: trunk/ChangeLog (177114 => 177115)


--- trunk/ChangeLog	2014-12-11 01:05:32 UTC (rev 177114)
+++ trunk/ChangeLog	2014-12-11 01:10:02 UTC (rev 177115)
@@ -1,3 +1,14 @@
+2014-12-10  Jon Honeycutt  <jhoneyc...@apple.com>
+
+        Null dereference performing a "TapAndAHalf" gesture in Google search field
+
+        <https://bugs.webkit.org/show_bug.cgi?id=139506>
+        <rdar://problem/19028828>
+
+        Reviewed by Darin Adler.
+
+        * ManualTests/ios/tap-and-a-half-gesture-in-empty-text-field.html: Added.
+
 2014-12-10  Dean Jackson  <d...@apple.com>
 
         Blur filter performance test doesn't provide results

Added: trunk/ManualTests/ios/tap-and-a-half-gesture-in-empty-text-field.html (0 => 177115)


--- trunk/ManualTests/ios/tap-and-a-half-gesture-in-empty-text-field.html	                        (rev 0)
+++ trunk/ManualTests/ios/tap-and-a-half-gesture-in-empty-text-field.html	2014-12-11 01:10:02 UTC (rev 177115)
@@ -0,0 +1,6 @@
+This tests that performing a tap and a half gesture in a text field with no nearby text does not crash.
+WebKit bug #<a href=""
+
+<br><br>
+
+<input size="40" placeholder="Perform a tap and a half gesture in this field">
\ No newline at end of file

Modified: trunk/Source/WebKit2/ChangeLog (177114 => 177115)


--- trunk/Source/WebKit2/ChangeLog	2014-12-11 01:05:32 UTC (rev 177114)
+++ trunk/Source/WebKit2/ChangeLog	2014-12-11 01:10:02 UTC (rev 177115)
@@ -1,3 +1,17 @@
+2014-12-09  Jon Honeycutt  <jhoneyc...@apple.com>
+
+        Null dereference performing a "TapAndAHalf" gesture in Google search field
+
+        <https://bugs.webkit.org/show_bug.cgi?id=139506>
+        <rdar://problem/19028828>
+
+        Reviewed by Darin Adler.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::selectWithGesture):
+        Add a null check in the case that there is no word range for the
+        current position.
+
 2014-12-10  Beth Dakin  <bda...@apple.com>
 
         Speculative build fix.

Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (177114 => 177115)


--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm	2014-12-11 01:05:32 UTC (rev 177114)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm	2014-12-11 01:10:02 UTC (rev 177115)
@@ -889,7 +889,7 @@
         switch (wkGestureState) {
         case GestureRecognizerState::Began:
             range = wordRangeFromPosition(position);
-            m_currentWordRange = Range::create(*frame.document(), range->startPosition(), range->endPosition());
+            m_currentWordRange = range ? Range::create(*frame.document(), range->startPosition(), range->endPosition()) : nullptr;
             break;
         case GestureRecognizerState::Changed:
             if (!m_currentWordRange)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to