<!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>[288251] releases/WebKitGTK/webkit-2.34</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/288251">288251</a></dd>
<dt>Author</dt> <dd>aperez@igalia.com</dd>
<dt>Date</dt> <dd>2022-01-19 16:22:09 -0800 (Wed, 19 Jan 2022)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/284754">r284754</a> - Null check in traverseNodesForSerialization
https://bugs.webkit.org/show_bug.cgi?id=230704

Patch by Rob Buis <rbuis@igalia.com> on 2021-10-23
Reviewed by Wenson Hsieh.

Source/WebCore:

Pass startNode by value instead of by pointer to
traverseNodesForSerialization.

Test: editing/pasteboard/copy-with-shadow-tree-crash.html

* editing/markup.cpp:
(WebCore::StyledMarkupAccumulator::serializeNodes):
(WebCore::StyledMarkupAccumulator::traverseNodesForSerialization):

LayoutTests:

* editing/pasteboard/copy-with-shadow-tree-crash-expected.txt: Added.
* editing/pasteboard/copy-with-shadow-tree-crash.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit234LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.34/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit234SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit234SourceWebCoreeditingmarkupcpp">releases/WebKitGTK/webkit-2.34/Source/WebCore/editing/markup.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit234LayoutTestseditingpasteboardcopywithshadowtreecrashexpectedtxt">releases/WebKitGTK/webkit-2.34/LayoutTests/editing/pasteboard/copy-with-shadow-tree-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit234LayoutTestseditingpasteboardcopywithshadowtreecrashhtml">releases/WebKitGTK/webkit-2.34/LayoutTests/editing/pasteboard/copy-with-shadow-tree-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit234LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.34/LayoutTests/ChangeLog (288250 => 288251)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.34/LayoutTests/ChangeLog     2022-01-20 00:21:58 UTC (rev 288250)
+++ releases/WebKitGTK/webkit-2.34/LayoutTests/ChangeLog        2022-01-20 00:22:09 UTC (rev 288251)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-10-23  Rob Buis  <rbuis@igalia.com>
+
+        Null check in traverseNodesForSerialization
+        https://bugs.webkit.org/show_bug.cgi?id=230704
+
+        Reviewed by Wenson Hsieh.
+
+        * editing/pasteboard/copy-with-shadow-tree-crash-expected.txt: Added.
+        * editing/pasteboard/copy-with-shadow-tree-crash.html: Added.
+
</ins><span class="cx"> 2021-10-22  Gabriel Nava Marino  <gnavamarino@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Check if start and end positions are still valid after updating them through mergeStartWithPreviousIfIdentical
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit234LayoutTestseditingpasteboardcopywithshadowtreecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.34/LayoutTests/editing/pasteboard/copy-with-shadow-tree-crash-expected.txt (0 => 288251)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.34/LayoutTests/editing/pasteboard/copy-with-shadow-tree-crash-expected.txt                           (rev 0)
+++ releases/WebKitGTK/webkit-2.34/LayoutTests/editing/pasteboard/copy-with-shadow-tree-crash-expected.txt      2022-01-20 00:22:09 UTC (rev 288251)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test passes if WebKit does not crash. PASS
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit234LayoutTestseditingpasteboardcopywithshadowtreecrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.34/LayoutTests/editing/pasteboard/copy-with-shadow-tree-crash.html (0 => 288251)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.34/LayoutTests/editing/pasteboard/copy-with-shadow-tree-crash.html                           (rev 0)
+++ releases/WebKitGTK/webkit-2.34/LayoutTests/editing/pasteboard/copy-with-shadow-tree-crash.html      2022-01-20 00:22:09 UTC (rev 288251)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+onload = () => {
+  let div0 = document.createElement('div');
+  document.body.appendChild(div0);
+  let span0 = document.createElement('span');
+  div0.appendChild(span0);
+  let div1 = document.createElement('div');
+  document.body.appendChild(div1);
+  span0.attachShadow({mode: 'open'}).appendChild(document.createElement('img'));
+  document.execCommand('SelectAll');
+  document.body.appendChild(document.createElement('input'));
+  document.designMode = 'on';
+  document.execCommand('InsertHTML', false, 'This test passes if WebKit does not crash. PASS');
+  document.designMode = 'off';
+  getSelection().modify('extend', 'left', 'lineboundary');
+  getSelection().modify('extend', 'right', 'lineboundary');
+  getSelection().extend(div1);
+  document.execCommand('Copy');
+};
+</script>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit234SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog (288250 => 288251)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog  2022-01-20 00:21:58 UTC (rev 288250)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog     2022-01-20 00:22:09 UTC (rev 288251)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2021-10-23  Rob Buis  <rbuis@igalia.com>
+
+        Null check in traverseNodesForSerialization
+        https://bugs.webkit.org/show_bug.cgi?id=230704
+
+        Reviewed by Wenson Hsieh.
+
+        Pass startNode by value instead of by pointer to
+        traverseNodesForSerialization.
+
+        Test: editing/pasteboard/copy-with-shadow-tree-crash.html
+
+        * editing/markup.cpp:
+        (WebCore::StyledMarkupAccumulator::serializeNodes):
+        (WebCore::StyledMarkupAccumulator::traverseNodesForSerialization):
+
</ins><span class="cx"> 2021-10-22  Gabriel Nava Marino  <gnavamarino@apple.com>
</span><span class="cx"> 
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=232177
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit234SourceWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/editing/markup.cpp (288250 => 288251)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.34/Source/WebCore/editing/markup.cpp 2022-01-20 00:21:58 UTC (rev 288250)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/editing/markup.cpp    2022-01-20 00:22:09 UTC (rev 288251)
</span><span class="lines">@@ -318,7 +318,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     enum class NodeTraversalMode { EmitString, DoNotEmitString };
</span><del>-    Node* traverseNodesForSerialization(Node* startNode, Node* pastEnd, NodeTraversalMode);
</del><ins>+    Node* traverseNodesForSerialization(Node& startNode, Node* pastEnd, NodeTraversalMode);
</ins><span class="cx"> 
</span><span class="cx">     bool appendNodeToPreserveMSOList(Node&);
</span><span class="cx"> 
</span><span class="lines">@@ -625,12 +625,14 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(start <= end);
</span><span class="cx">     auto startNode = start.firstNode();
</span><ins>+    if (!startNode)
+        return nullptr;
</ins><span class="cx">     Node* pastEnd = end.computeNodeAfterPosition();
</span><span class="cx">     if (!pastEnd && end.containerNode())
</span><span class="cx">         pastEnd = nextSkippingChildren(*end.containerNode());
</span><span class="cx"> 
</span><span class="cx">     if (!m_highestNodeToBeSerialized) {
</span><del>-        Node* lastClosed = traverseNodesForSerialization(startNode.get(), pastEnd, NodeTraversalMode::DoNotEmitString);
</del><ins>+        Node* lastClosed = traverseNodesForSerialization(*startNode, pastEnd, NodeTraversalMode::DoNotEmitString);
</ins><span class="cx">         m_highestNodeToBeSerialized = lastClosed;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -637,10 +639,10 @@
</span><span class="cx">     if (m_highestNodeToBeSerialized && m_highestNodeToBeSerialized->parentNode())
</span><span class="cx">         m_wrappingStyle = EditingStyle::wrappingStyleForSerialization(*m_highestNodeToBeSerialized->parentNode(), shouldAnnotate(), m_standardFontFamilySerializationMode);
</span><span class="cx"> 
</span><del>-    return traverseNodesForSerialization(startNode.get(), pastEnd, NodeTraversalMode::EmitString);
</del><ins>+    return traverseNodesForSerialization(*startNode, pastEnd, NodeTraversalMode::EmitString);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-Node* StyledMarkupAccumulator::traverseNodesForSerialization(Node* startNode, Node* pastEnd, NodeTraversalMode traversalMode)
</del><ins>+Node* StyledMarkupAccumulator::traverseNodesForSerialization(Node& startNode, Node* pastEnd, NodeTraversalMode traversalMode)
</ins><span class="cx"> {
</span><span class="cx">     const bool shouldEmit = traversalMode == NodeTraversalMode::EmitString;
</span><span class="cx"> 
</span><span class="lines">@@ -680,7 +682,7 @@
</span><span class="cx"> 
</span><span class="cx">     Node* lastNode = nullptr;
</span><span class="cx">     Node* next = nullptr;
</span><del>-    for (auto* n = startNode; n != pastEnd; lastNode = n, n = next) {
</del><ins>+    for (auto* n = &startNode; n != pastEnd; lastNode = n, n = next) {
</ins><span class="cx"> 
</span><span class="cx">         Vector<Node*, 8> exitedAncestors;
</span><span class="cx">         next = nullptr;
</span></span></pre>
</div>
</div>

</body>
</html>