Changeset 243844 in webkit

Timestamp:

Apr 3, 2019, 7:01:07 PM (7 years ago)

Author:

rniwa@webkit.org

Message:

Nullptr crash in InlineTextBox::selectionState via TextIndicator::createWithRange
​https://bugs.webkit.org/show_bug.cgi?id=196579

Reviewed by Simon Fraser.

Avoid crashing accessing the unengated optional's value in relese builds for now.

Unfortunately, fixing the underlying cause of the selection states of RenderView & RenderObject
getting out out of sync would require a significant re-architecturing of the whole selection
repainting / state managing mechanism.

• rendering/SelectionRangeData.h:

(WebCore::SelectionRangeData::startPosition const):
(WebCore::SelectionRangeData::endPosition const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/SelectionRangeData.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-03  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Nullptr crash in InlineTextBox::selectionState via TextIndicator::createWithRange
+        https://bugs.webkit.org/show_bug.cgi?id=196579
+
+        Reviewed by Simon Fraser.
+
+        Avoid crashing accessing the unengated optional's value in relese builds for now.
+
+        Unfortunately, fixing the underlying cause of the selection states of RenderView & RenderObject
+        getting out out of sync would require a significant re-architecturing of the whole selection
+        repainting / state managing mechanism.
+
+        * rendering/SelectionRangeData.h:
+        (WebCore::SelectionRangeData::startPosition const):
+        (WebCore::SelectionRangeData::endPosition const):
+
 2019-04-03  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/rendering/SelectionRangeData.h

@@ -79 +79 @@
     RenderObject* start() const { return m_selectionContext.start(); }
     RenderObject* end() const { return m_selectionContext.end(); }
-    unsigned startPosition() const { ASSERT(m_selectionContext.startPosition()); return m_selectionContext.startPosition().value(); }
-    unsigned endPosition() const { ASSERT(m_selectionContext.endPosition()); return m_selectionContext.endPosition().value(); }
+
+    unsigned startPosition() const { ASSERT(m_selectionContext.startPosition()); return m_selectionContext.startPosition().valueOr(0); }
+    unsigned endPosition() const { ASSERT(m_selectionContext.endPosition()); return m_selectionContext.endPosition().valueOr(0); }
 
     void clear();