Changeset 286531 in webkit

Timestamp:

Dec 4, 2021, 7:24:46 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Fix parentNode in CompositeEditCommand::splitTreeToNode
​https://bugs.webkit.org/show_bug.cgi?id=230710

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

Source/WebCore:

Fix parentNode handling in CompositeEditCommand::splitTreeToNode and
also a few more IndentOutdentCommand methods to support the test case.

Test: editing/execCommand/outdent-cut-crash.html

• editing/CompositeEditCommand.cpp:

(WebCore::CompositeEditCommand::moveParagraphs):

• editing/IndentOutdentCommand.cpp:

(WebCore::IndentOutdentCommand::indentIntoBlockquote): do not call positionInParentAfterNode
if insertNodeBefore failed.
(WebCore::IndentOutdentCommand::outdentParagraph): need to check for null positions
before calling moveParagraphs.

LayoutTests:

• editing/execCommand/outdent-cut-crash-expected.txt: Added.
• editing/execCommand/outdent-cut-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/execCommand/outdent-cut-crash-expected.txt (added)
• LayoutTests/editing/execCommand/outdent-cut-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/CompositeEditCommand.cpp (modified) (2 diffs)
• Source/WebCore/editing/IndentOutdentCommand.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-12-04  Rob Buis  <rbuis@igalia.com>
+
+        Fix parentNode in CompositeEditCommand::splitTreeToNode
+        https://bugs.webkit.org/show_bug.cgi?id=230710
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/execCommand/outdent-cut-crash-expected.txt: Added.
+        * editing/execCommand/outdent-cut-crash.html: Added.
+
 2021-12-04  Tyler Wilcock  <tyler_w@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-04  Rob Buis  <rbuis@igalia.com>
+
+        Fix parentNode in CompositeEditCommand::splitTreeToNode
+        https://bugs.webkit.org/show_bug.cgi?id=230710
+
+        Reviewed by Ryosuke Niwa.
+
+        Fix parentNode handling in CompositeEditCommand::splitTreeToNode and
+        also a few more IndentOutdentCommand methods to support the test case.
+
+        Test: editing/execCommand/outdent-cut-crash.html
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::moveParagraphs):
+        * editing/IndentOutdentCommand.cpp:
+        (WebCore::IndentOutdentCommand::indentIntoBlockquote): do not call positionInParentAfterNode
+        if insertNodeBefore failed.
+        (WebCore::IndentOutdentCommand::outdentParagraph): need to check for null positions
+        before calling moveParagraphs.
+
 2021-12-04  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -1751 +1751 @@
     ASSERT(adjustedEnd);
     RefPtr<Node> node;
-    for (node = &start; node && node->parentNode() != adjustedEnd; node = node->parentNode()) {
+    for (node = &start; node && node->parentNode() != adjustedEnd;) {
         RefPtr parentNode = node->parentNode();
         if (!parentNode || !is<Element>(*parentNode) || editingIgnoresContent(*parentNode))
@@ -1760 +1760 @@
         if (positionInParent != positionInNode)
             splitElement(downcast<Element>(*parentNode), *node);
+        node = parentNode;
     }
 

trunk/Source/WebCore/editing/IndentOutdentCommand.cpp

@@ -117 +117 @@
         if (outerBlock == nodeToSplitTo)
             insertNodeAt(*targetBlockquote, start);
-        else
-            insertNodeBefore(*targetBlockquote, *outerBlock);
+        else if (!insertNodeBefore(*targetBlockquote, *outerBlock))
+            return;
         startOfContents = positionInParentAfterNode(targetBlockquote.get());
     }
@@ -193 +193 @@
     auto placeholder = HTMLBRElement::create(document());
     insertNodeBefore(placeholder, *splitBlockquoteNode);
-    if (placeholder->isConnected())
-        moveParagraph(startOfParagraph(visibleStartOfParagraph), endOfParagraph(visibleEndOfParagraph), positionBeforeNode(placeholder.ptr()), true);
+    if (!placeholder->isConnected())
+        return;
+    auto visibleStartOfParagraphToMove = startOfParagraph(visibleStartOfParagraph);
+    auto visibleEndOfParagraphToMove = endOfParagraph(visibleEndOfParagraph);
+    if (visibleStartOfParagraphToMove.isNull() || visibleEndOfParagraphToMove.isNull())
+        return;
+    moveParagraph(visibleStartOfParagraphToMove, visibleEndOfParagraphToMove, positionBeforeNode(placeholder.ptr()), true);
 }