<!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>[259951] releases/WebKitGTK/webkit-2.28</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/259951">259951</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2020-04-12 06:03:18 -0700 (Sun, 12 Apr 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/258662">r258662</a> - Fix ReplaceSelectionCommand::InsertedNodes::willRemoveNodePreservingChildren crash
https://bugs.webkit.org/show_bug.cgi?id=208312

Patch by Eugene But <eugenebut@chromium.org> on 2020-03-18
Reviewed by Ryosuke Niwa

ReplaceSelectionCommand::InsertedNodes::willRemoveNodePreservingChildren
was crashing on dereferencing m_firstNodeInserted pointer. Before the crash
ReplaceSelectionCommand::InsertedNodes object received the following calls:

respondToNodeInsertion() with node A, which set m_firstNodeInserted and m_lastNodeInserted to A
willRemoveNode() with node B, which left m_firstNodeInserted and m_lastNodeInserted unchanged (A)
(node A was destroyed setting m_firstNodeInserted and m_lastNodeInserted to null)
respondToNodeInsertion() with node C, which set m_firstNodeInserted and m_lastNodeInserted to C
willRemoveNodePreservingChildren() with node C, which set m_firstNodeInserted to null and crashed

This patch checks m_firstNodeInserted before dereferencing and sets m_lastNodeInserted to null if
m_firstNodeInserted became null. It seems like having non-null value for m_lastNodeInserted would
be an invalid state.

Test: editing/pasteboard/insert-apple-style-span-after-timeout.html

* editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::InsertedNodes::willRemoveNodePreservingChildren):

LayoutTests:
Test for ReplaceSelectionCommand::InsertedNodes::willRemoveNodePreservingChildren crash fix
https://bugs.webkit.org/show_bug.cgi?id=208312

Patch by Eugene But <eugenebut@chromium.org> on 2020-03-18
Reviewed by Ryosuke Niwa

This test insers empty Apple-style-span after timeout to a non-empty document.

* editing/pasteboard/insert-apple-style-span-after-timeout.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit228LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.28/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit228SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit228SourceWebCoreeditingReplaceSelectionCommandcpp">releases/WebKitGTK/webkit-2.28/Source/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit228LayoutTestseditingpasteboardinsertapplestylespanaftertimeoutexpectedtxt">releases/WebKitGTK/webkit-2.28/LayoutTests/editing/pasteboard/insert-apple-style-span-after-timeout-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit228LayoutTestseditingpasteboardinsertapplestylespanaftertimeouthtml">releases/WebKitGTK/webkit-2.28/LayoutTests/editing/pasteboard/insert-apple-style-span-after-timeout.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit228LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.28/LayoutTests/ChangeLog (259950 => 259951)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.28/LayoutTests/ChangeLog     2020-04-12 13:03:13 UTC (rev 259950)
+++ releases/WebKitGTK/webkit-2.28/LayoutTests/ChangeLog        2020-04-12 13:03:18 UTC (rev 259951)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2020-03-18  Eugene But  <eugenebut@chromium.org>
+
+        Test for ReplaceSelectionCommand::InsertedNodes::willRemoveNodePreservingChildren crash fix
+        https://bugs.webkit.org/show_bug.cgi?id=208312
+
+        Reviewed by Ryosuke Niwa
+
+        This test insers empty Apple-style-span after timeout to a non-empty document.
+
+        * editing/pasteboard/insert-apple-style-span-after-timeout.html:
+
</ins><span class="cx"> 2020-03-16  ChangSeok Oh  <changseok@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         A change event gets dispatched when textarea gets changed without focus
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit228LayoutTestseditingpasteboardinsertapplestylespanaftertimeoutexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.28/LayoutTests/editing/pasteboard/insert-apple-style-span-after-timeout-expected.txt (0 => 259951)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.28/LayoutTests/editing/pasteboard/insert-apple-style-span-after-timeout-expected.txt                         (rev 0)
+++ releases/WebKitGTK/webkit-2.28/LayoutTests/editing/pasteboard/insert-apple-style-span-after-timeout-expected.txt    2020-04-12 13:03:18 UTC (rev 259951)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+No crash!
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit228LayoutTestseditingpasteboardinsertapplestylespanaftertimeouthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.28/LayoutTests/editing/pasteboard/insert-apple-style-span-after-timeout.html (0 => 259951)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.28/LayoutTests/editing/pasteboard/insert-apple-style-span-after-timeout.html                         (rev 0)
+++ releases/WebKitGTK/webkit-2.28/LayoutTests/editing/pasteboard/insert-apple-style-span-after-timeout.html    2020-04-12 13:03:18 UTC (rev 259951)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<html>
+  <body>
+    <script>    
+      if (window.testRunner) {
+        window.testRunner.dumpAsText();
+        window.testRunner.waitUntilDone();
+      }
+
+      function test() {
+        document.designMode = 'on';
+        document.execCommand("selectAll");
+        document.execCommand("InsertHTML", false, "<p>No crash!</p>");
+        document.execCommand("InsertHTML", false, "<span class='Apple-style-span'></span>");
+        
+        if (window.testRunner)
+          testRunner.notifyDone();
+      }
+      setTimeout(test);
+    </script>&lt;
+  </body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit228SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog (259950 => 259951)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog  2020-04-12 13:03:13 UTC (rev 259950)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/ChangeLog     2020-04-12 13:03:18 UTC (rev 259951)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2020-03-18  Eugene But  <eugenebut@chromium.org>
+
+        Fix ReplaceSelectionCommand::InsertedNodes::willRemoveNodePreservingChildren crash
+        https://bugs.webkit.org/show_bug.cgi?id=208312
+        
+        Reviewed by Ryosuke Niwa
+
+        ReplaceSelectionCommand::InsertedNodes::willRemoveNodePreservingChildren
+        was crashing on dereferencing m_firstNodeInserted pointer. Before the crash
+        ReplaceSelectionCommand::InsertedNodes object received the following calls:
+
+        respondToNodeInsertion() with node A, which set m_firstNodeInserted and m_lastNodeInserted to A
+        willRemoveNode() with node B, which left m_firstNodeInserted and m_lastNodeInserted unchanged (A)
+        (node A was destroyed setting m_firstNodeInserted and m_lastNodeInserted to null)
+        respondToNodeInsertion() with node C, which set m_firstNodeInserted and m_lastNodeInserted to C
+        willRemoveNodePreservingChildren() with node C, which set m_firstNodeInserted to null and crashed
+
+        This patch checks m_firstNodeInserted before dereferencing and sets m_lastNodeInserted to null if
+        m_firstNodeInserted became null. It seems like having non-null value for m_lastNodeInserted would
+        be an invalid state.
+
+        Test: editing/pasteboard/insert-apple-style-span-after-timeout.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::InsertedNodes::willRemoveNodePreservingChildren):
+
</ins><span class="cx"> 2020-03-16  ChangSeok Oh  <changseok@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         A change event gets dispatched when textarea gets changed without focus
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit228SourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.28/Source/WebCore/editing/ReplaceSelectionCommand.cpp (259950 => 259951)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.28/Source/WebCore/editing/ReplaceSelectionCommand.cpp        2020-04-12 13:03:13 UTC (rev 259950)
+++ releases/WebKitGTK/webkit-2.28/Source/WebCore/editing/ReplaceSelectionCommand.cpp   2020-04-12 13:03:18 UTC (rev 259951)
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx">         m_firstNodeInserted = NodeTraversal::next(*node);
</span><span class="cx">     if (m_lastNodeInserted == node) {
</span><span class="cx">         m_lastNodeInserted = node->lastChild() ? node->lastChild() : NodeTraversal::nextSkippingChildren(*node);
</span><del>-        if (!m_lastNodeInserted) {
</del><ins>+        if (!m_lastNodeInserted && m_firstNodeInserted) {
</ins><span class="cx">             // If the last inserted node is at the end of the document and doesn't have any children, look backwards for the
</span><span class="cx">             // previous node as the last inserted node, clamping to the first inserted node if needed to ensure that the
</span><span class="cx">             // document position of the last inserted node is not behind the first inserted node.
</span></span></pre>
</div>
</div>

</body>
</html>