<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[269778] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/269778">269778</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2020-11-13 08:04:15 -0800 (Fri, 13 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Crash in ReplaceSelectionCommand::moveNodeOutOfAncestor
https://bugs.webkit.org/show_bug.cgi?id=218878

Patch by Julian Gonzalez <julian_a_gonzalez@apple.com> on 2020-11-13
Reviewed by Alex Christensen.

Source/WebCore:

Add a missing null check inside moveNodeOutOfAncestor, as splitTreeToNode()
can return nullptr.

Test: editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule.html

* editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::moveNodeOutOfAncestor):

LayoutTests:

Add simple test that selects elements, and using execCommand() inserts text
and a horizontal rule, and performs a deletion.

* editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule-expected.txt: Added.
* editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceSelectionCommandcpp">trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingexecCommandcrashdeletingafterinsertingtexthorizontalruleexpectedtxt">trunk/LayoutTests/editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingexecCommandcrashdeletingafterinsertingtexthorizontalrulehtml">trunk/LayoutTests/editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (269777 => 269778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2020-11-13 16:01:05 UTC (rev 269777)
+++ trunk/LayoutTests/ChangeLog 2020-11-13 16:04:15 UTC (rev 269778)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2020-11-13  Julian Gonzalez  <julian_a_gonzalez@apple.com>
+
+        Crash in ReplaceSelectionCommand::moveNodeOutOfAncestor
+        https://bugs.webkit.org/show_bug.cgi?id=218878
+
+        Reviewed by Alex Christensen.
+
+        Add simple test that selects elements, and using execCommand() inserts text
+        and a horizontal rule, and performs a deletion.
+
+        * editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule-expected.txt: Added.
+        * editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule.html: Added.
+
</ins><span class="cx"> 2020-11-13  Rob Buis  <rbuis@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Null check anchorNode of endingSelection start
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandcrashdeletingafterinsertingtexthorizontalruleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule-expected.txt (0 => 269778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule-expected.txt                           (rev 0)
+++ trunk/LayoutTests/editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule-expected.txt      2020-11-13 16:04:15 UTC (rev 269778)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+This tests that we do not crash while deleting the selection.
+
+PASS
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandcrashdeletingafterinsertingtexthorizontalrulehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule.html (0 => 269778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule.html                           (rev 0)
+++ trunk/LayoutTests/editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule.html      2020-11-13 16:04:15 UTC (rev 269778)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<html>
+<head>
+<script>
+function testonload() {
+    if (window.testRunner)
+        testRunner.dumpAsText();
+
+    document.getSelection().selectAllChildren(pre);
+    document.execCommand("insertText", false, "PASS");
+    document.execCommand("insertHorizontalRule", false);
+}
+function iframehandler() {
+    document.execCommand("forwardDelete", false);
+}
+</script>
+</head>
+<body onload=testonload()>
+This tests that we do not crash while deleting the selection.
+<details open="true" contenteditable="true">
+<p>
+<iframe onload="iframehandler()"></iframe>
+<table>
+<pre id="pre"></pre>
+</table>
+</p>
+</details>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (269777 => 269778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2020-11-13 16:01:05 UTC (rev 269777)
+++ trunk/Source/WebCore/ChangeLog      2020-11-13 16:04:15 UTC (rev 269778)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2020-11-13  Julian Gonzalez  <julian_a_gonzalez@apple.com>
+
+        Crash in ReplaceSelectionCommand::moveNodeOutOfAncestor
+        https://bugs.webkit.org/show_bug.cgi?id=218878
+
+        Reviewed by Alex Christensen.
+
+        Add a missing null check inside moveNodeOutOfAncestor, as splitTreeToNode()
+        can return nullptr.
+
+        Test: editing/execCommand/crash-deleting-after-inserting-text-horizontal-rule.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::moveNodeOutOfAncestor):
+
</ins><span class="cx"> 2020-11-13  Rob Buis  <rbuis@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         Null check anchorNode of endingSelection start
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (269777 => 269778)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2020-11-13 16:01:05 UTC (rev 269777)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp    2020-11-13 16:04:15 UTC (rev 269778)
</span><span class="lines">@@ -800,7 +800,8 @@
</span><span class="cx">     } else {
</span><span class="cx">         RefPtr<Node> nodeToSplitTo = splitTreeToNode(node, ancestor, true);
</span><span class="cx">         removeNode(node);
</span><del>-        insertNodeBefore(WTFMove(protectedNode), *nodeToSplitTo);
</del><ins>+        if (nodeToSplitTo)
+            insertNodeBefore(WTFMove(protectedNode), *nodeToSplitTo);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     document().updateLayoutIgnorePendingStylesheets();
</span></span></pre>
</div>
</div>

</body>
</html>