Changeset 286553 in webkit

Timestamp:

Dec 6, 2021, 11:13:26 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Null check in shouldUseBreakElement
​https://bugs.webkit.org/show_bug.cgi?id=229275

Patch by Rob Buis <​rbuis@igalia.com> on 2021-12-06
Reviewed by Ryosuke Niwa.

Source/WebCore:

Need to null check node in shouldUseBreakElement.
Also bail out early in InsertLineBreakCommand::doApply
in case position is not editable.

Test: editing/execCommand/insert-line-break-crash.html

• editing/InsertLineBreakCommand.cpp:

(WebCore::InsertLineBreakCommand::shouldUseBreakElement):
(WebCore::InsertLineBreakCommand::doApply):

LayoutTests:

• editing/execCommand/insert-line-break-crash-expected.txt: Added.
• editing/execCommand/insert-line-break-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/insert-line-break-crash-expected.txt (added)
• LayoutTests/editing/execCommand/insert-line-break-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/InsertLineBreakCommand.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-12-06  Rob Buis  <rbuis@igalia.com>
+
+        Null check in shouldUseBreakElement
+        https://bugs.webkit.org/show_bug.cgi?id=229275
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/execCommand/insert-line-break-crash-expected.txt: Added.
+        * editing/execCommand/insert-line-break-crash.html: Added.
+
 2021-12-06  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-06  Rob Buis  <rbuis@igalia.com>
+
+        Null check in shouldUseBreakElement
+        https://bugs.webkit.org/show_bug.cgi?id=229275
+
+        Reviewed by Ryosuke Niwa.
+
+        Need to null check node in shouldUseBreakElement.
+        Also bail out early in InsertLineBreakCommand::doApply
+        in case position is not editable.
+
+        Test: editing/execCommand/insert-line-break-crash.html
+
+        * editing/InsertLineBreakCommand.cpp:
+        (WebCore::InsertLineBreakCommand::shouldUseBreakElement):
+        (WebCore::InsertLineBreakCommand::doApply):
+
 2021-12-06  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/Source/WebCore/editing/InsertLineBreakCommand.cpp

@@ -61 +61 @@
     // parent's renderer.
     auto* node = position.parentAnchoredEquivalent().deprecatedNode();
-    return node->renderer() && !node->renderer()->style().preserveNewline();
+    return node && node->renderer() && !node->renderer()->style().preserveNewline();
 }
 
@@ -82 +82 @@
     position = positionOutsideTabSpan(position);
 
+    if (!isEditablePosition(position))
+        return;
+
     RefPtr<Node> nodeToInsert;
     if (shouldUseBreakElement(position))
@@ -92 +95 @@
     if (isEndOfParagraph(caret) && !lineBreakExistsAtVisiblePosition(caret)) {
         bool needExtraLineBreak = !is<HTMLHRElement>(*position.deprecatedNode()) && !is<HTMLTableElement>(*position.deprecatedNode());
-        
+
         insertNodeAt(*nodeToInsert, position);