<!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>[287118] 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/287118">287118</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-12-15 16:55:58 -0800 (Wed, 15 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>null ptr deref in WebCore::ApplyStyleCommand::applyRelativeFontStyleChange
https://bugs.webkit.org/show_bug.cgi?id=234312

Patch by Gabriel Nava Marino <gnavamarino@apple.com> on 2021-12-15
Reviewed by Chris Dumez.

Source/WebCore:

In some situations calling ApplyStyleCommand::nodeFullySelected forces layout in a
way that disconnects the element. In this situation, we now break out of iteration.

We also add an isOrphan() check in ApplyStyleCommand::applyInlineStyle given
the possibility of this scenario.

Test: fast/editing/apply-relative-font-style-change-crash-004.html

* editing/ApplyStyleCommand.cpp:
(WebCore::ApplyStyleCommand::applyRelativeFontStyleChange):
(WebCore::ApplyStyleCommand::applyInlineStyle):

LayoutTests:

* TestExpectations:
* fast/editing/apply-relative-font-style-change-crash-004-expected.txt: Added.
* fast/editing/apply-relative-font-style-change-crash-004.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyStyleCommandcpp">trunk/Source/WebCore/editing/ApplyStyleCommand.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasteditingapplyrelativefontstylechangecrash004expectedtxt">trunk/LayoutTests/fast/editing/apply-relative-font-style-change-crash-004-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasteditingapplyrelativefontstylechangecrash004html">trunk/LayoutTests/fast/editing/apply-relative-font-style-change-crash-004.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (287117 => 287118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-12-16 00:55:07 UTC (rev 287117)
+++ trunk/LayoutTests/ChangeLog 2021-12-16 00:55:58 UTC (rev 287118)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-12-15  Gabriel Nava Marino  <gnavamarino@apple.com>
+
+        null ptr deref in WebCore::ApplyStyleCommand::applyRelativeFontStyleChange
+        https://bugs.webkit.org/show_bug.cgi?id=234312
+
+        Reviewed by Chris Dumez.
+
+        * TestExpectations:
+        * fast/editing/apply-relative-font-style-change-crash-004-expected.txt: Added.
+        * fast/editing/apply-relative-font-style-change-crash-004.html: Added.
+
</ins><span class="cx"> 2021-12-15  J Pascoe  <j_pascoe@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [WebAuthn] Allow same-site, cross-origin iframe get()
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (287117 => 287118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations       2021-12-16 00:55:07 UTC (rev 287117)
+++ trunk/LayoutTests/TestExpectations  2021-12-16 00:55:58 UTC (rev 287118)
</span><span class="lines">@@ -3377,6 +3377,9 @@
</span><span class="cx"> fast/text/design-system-ui-15.html [ ImageOnlyFailure ]
</span><span class="cx"> fast/text/design-system-ui-16.html [ ImageOnlyFailure ]
</span><span class="cx"> 
</span><ins>+# This is a crash test.
+fast/editing/apply-relative-font-style-change-crash-004.html [ Pass Failure ]
+
</ins><span class="cx"> # This is a crash test. The result is ignored for now.
</span><span class="cx"> imported/w3c/web-platform-tests/shadow-dom/imperative-slot-assign-not-slotable-crash.html [ Pass Failure ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfasteditingapplyrelativefontstylechangecrash004expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/editing/apply-relative-font-style-change-crash-004-expected.txt (0 => 287118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/editing/apply-relative-font-style-change-crash-004-expected.txt                           (rev 0)
+++ trunk/LayoutTests/fast/editing/apply-relative-font-style-change-crash-004-expected.txt      2021-12-16 00:55:58 UTC (rev 287118)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: RangeError: Maximum call stack size exceeded.
+CONSOLE MESSAGE: This test passes if it does not crash.
+a
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasteditingapplyrelativefontstylechangecrash004html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/editing/apply-relative-font-style-change-crash-004.html (0 => 287118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/editing/apply-relative-font-style-change-crash-004.html                           (rev 0)
+++ trunk/LayoutTests/fast/editing/apply-relative-font-style-change-crash-004.html      2021-12-16 00:55:58 UTC (rev 287118)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+<style>
+  video {
+    appearance: push-button;
+  }
+</style>
+<script>
+  onerror = () => {
+      document.execCommand('InsertOrderedList');
+  };
+  document.onbeforeinput = () => {
+    document.execCommand('FontSizeDelta', false, '2');
+  };
+  onload = () => {
+    document.body.append('a');
+    let video0 = document.createElement('video');
+    video0.controls = true;
+    document.body.appendChild(video0);
+    document.designMode = 'on';
+    document.body.appendChild(document.createElement('input'));
+    document.execCommand('SelectAll');
+    document.execCommand('InsertText', false, '');
+    if (window.testRunner)
+        testRunner.dumpAsText();
+    console.log("This 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 (287117 => 287118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-12-16 00:55:07 UTC (rev 287117)
+++ trunk/Source/WebCore/ChangeLog      2021-12-16 00:55:58 UTC (rev 287118)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-12-15  Gabriel Nava Marino  <gnavamarino@apple.com>
+
+        null ptr deref in WebCore::ApplyStyleCommand::applyRelativeFontStyleChange
+        https://bugs.webkit.org/show_bug.cgi?id=234312
+
+        Reviewed by Chris Dumez.
+
+        In some situations calling ApplyStyleCommand::nodeFullySelected forces layout in a
+        way that disconnects the element. In this situation, we now break out of iteration.
+
+        We also add an isOrphan() check in ApplyStyleCommand::applyInlineStyle given
+        the possibility of this scenario.
+
+        Test: fast/editing/apply-relative-font-style-change-crash-004.html
+
+        * editing/ApplyStyleCommand.cpp:
+        (WebCore::ApplyStyleCommand::applyRelativeFontStyleChange):
+        (WebCore::ApplyStyleCommand::applyInlineStyle):
+
</ins><span class="cx"> 2021-12-15  J Pascoe  <j_pascoe@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [WebAuthn] Allow same-site, cross-origin iframe get()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyStyleCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (287117 => 287118)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp       2021-12-16 00:55:07 UTC (rev 287117)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp  2021-12-16 00:55:58 UTC (rev 287118)
</span><span class="lines">@@ -385,8 +385,11 @@
</span><span class="cx">         RefPtr<HTMLElement> element;
</span><span class="cx">         if (is<HTMLElement>(*node)) {
</span><span class="cx">             // Only work on fully selected nodes.
</span><del>-            if (!nodeFullySelected(downcast<HTMLElement>(*node), start, end))
</del><ins>+            if (!nodeFullySelected(downcast<HTMLElement>(*node), start, end)) {
+                if (!node->isConnected())
+                    break;
</ins><span class="cx">                 continue;
</span><ins>+            }
</ins><span class="cx">             element = &downcast<HTMLElement>(*node);
</span><span class="cx">         } else if (is<Text>(*node) && node->renderer() && node->parentNode() != lastStyledNode) {
</span><span class="cx">             // Last styled node was not parent node of this text node, but we wish to style this
</span><span class="lines">@@ -588,7 +591,7 @@
</span><span class="cx">         endDummySpanAncestor = dummySpanAncestorForNode(end.deprecatedNode());
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (start.isNull() || end.isNull())
</del><ins>+    if (start.isNull() || start.isOrphan() || end.isNull() || end.isOrphan())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     // Remove style from the selection.
</span></span></pre>
</div>
</div>

</body>
</html>