<!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>[281745] 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/281745">281745</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-08-29 10:38:29 -0700 (Sun, 29 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Nullptr crash in ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline
https://bugs.webkit.org/show_bug.cgi?id=229280

Patch by Rob Buis <rbuis@igalia.com> on 2021-08-29
Reviewed by Ryosuke Niwa.

Source/WebCore:

Null check context in removeRedundantStylesAndKeepStyleSpanInline
since the parent node can be null.

Test: editing/selection/replace-selection-crash-02.html

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

LayoutTests:

* editing/selection/replace-selection-crash-02-expected.txt: Added.
* editing/selection/replace-selection-crash-02.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="#trunkLayoutTestseditingselectionreplaceselectioncrash02expectedtxt">trunk/LayoutTests/editing/selection/replace-selection-crash-02-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingselectionreplaceselectioncrash02html">trunk/LayoutTests/editing/selection/replace-selection-crash-02.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (281744 => 281745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-08-29 16:10:25 UTC (rev 281744)
+++ trunk/LayoutTests/ChangeLog 2021-08-29 17:38:29 UTC (rev 281745)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-08-29  Rob Buis  <rbuis@igalia.com>
+
+        Nullptr crash in ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline
+        https://bugs.webkit.org/show_bug.cgi?id=229280
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/selection/replace-selection-crash-02-expected.txt: Added.
+        * editing/selection/replace-selection-crash-02.html: Added.
+
</ins><span class="cx"> 2021-08-28  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Zooming browser does not properly scale SVG clip paths
</span></span></pre></div>
<a id="trunkLayoutTestseditingselectionreplaceselectioncrash02expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/replace-selection-crash-02-expected.txt (0 => 281745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/replace-selection-crash-02-expected.txt                              (rev 0)
+++ trunk/LayoutTests/editing/selection/replace-selection-crash-02-expected.txt 2021-08-29 17:38:29 UTC (rev 281745)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Test passes if it does not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestseditingselectionreplaceselectioncrash02html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/selection/replace-selection-crash-02.html (0 => 281745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/selection/replace-selection-crash-02.html                              (rev 0)
+++ trunk/LayoutTests/editing/selection/replace-selection-crash-02.html 2021-08-29 17:38:29 UTC (rev 281745)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<style>
+sub {
+    -webkit-user-select: all;
+}
+.div {
+     overflow: scroll;
+}
+</style>
+<script>
+onload = () => {
+    if (window.testRunner)
+        window.testRunner.dumpAsText();
+    let div = document.createElement('div');
+    div.className = 'div';
+    document.body.appendChild(div);
+    let span0 = document.createElement('span');
+    document.body.appendChild(span0);
+    span0.appendChild(document.createElement('div'));
+    let span1 = document.createElement('span');
+    span0.appendChild(span1);
+    div = document.createElement('div');
+    div.className = 'div';
+    span1.appendChild(div);
+    div = document.createElement('div');
+    div.className = 'div';
+    document.body.appendChild(div);
+    document.designMode = 'on';
+    document.execCommand('SelectAll');
+    document.execCommand('Subscript');
+    document.execCommand('Copy');
+    document.execCommand('Paste');
+    document.write("Test passes if it does not crash.");
+};
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281744 => 281745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-29 16:10:25 UTC (rev 281744)
+++ trunk/Source/WebCore/ChangeLog      2021-08-29 17:38:29 UTC (rev 281745)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-08-29  Rob Buis  <rbuis@igalia.com>
+
+        Nullptr crash in ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline
+        https://bugs.webkit.org/show_bug.cgi?id=229280
+
+        Reviewed by Ryosuke Niwa.
+
+        Null check context in removeRedundantStylesAndKeepStyleSpanInline
+        since the parent node can be null.
+
+        Test: editing/selection/replace-selection-crash-02.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplaceSelectionCommand::removeRedundantStylesAndKeepStyleSpanInline):
+
</ins><span class="cx"> 2021-08-29  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC][IFC] Make line runs relative to the formatting root border box.
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (281744 => 281745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2021-08-29 16:10:25 UTC (rev 281744)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp    2021-08-29 17:38:29 UTC (rev 281745)
</span><span class="lines">@@ -664,8 +664,14 @@
</span><span class="cx"> 
</span><span class="cx">             // If Mail wraps the fragment with a Paste as Quotation blockquote, or if you're pasting into a quoted region,
</span><span class="cx">             // styles from blockquoteNode are allowed to override those from the source document, see <rdar://problem/4930986> and <rdar://problem/5089327>.
</span><del>-            RefPtr<Node> blockquoteNode = isMailPasteAsQuotationNode(context.get()) ? context.get() : enclosingNodeOfType(firstPositionInNode(context.get()), isMailBlockquote, CanCrossEditingBoundary);
-            if (blockquoteNode)
</del><ins>+            auto hasBlockquoteNode = [&]() -> bool {
+                if (!context)
+                    return false;
+                if (isMailPasteAsQuotationNode(context.get()))
+                    return true;
+                return enclosingNodeOfType(firstPositionInNode(context.get()), isMailBlockquote, CanCrossEditingBoundary);
+            };
+            if (hasBlockquoteNode())
</ins><span class="cx">                 newInlineStyle->removeStyleFromRulesAndContext(*element, document().documentElement());
</span><span class="cx"> 
</span><span class="cx">             newInlineStyle->removeStyleFromRulesAndContext(*element, context.get());
</span></span></pre>
</div>
</div>

</body>
</html>