<!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>[281795] 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/281795">281795</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-08-31 01:39:52 -0700 (Tue, 31 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Nullptr crash in TypingCommand::willAddTypingToOpenCommand via TypingCommand::deleteKeyPressed
https://bugs.webkit.org/show_bug.cgi?id=229277

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

Source/WebCore:

Rewtite CompositeEditCommand::shouldBreakOutOfEmptyListItem() to return just VisibleSelection
and check that it is not none in TypingCommand::willAddTypingToOpenCommand.

Test: editing/deleting/delete-key-crash.html

* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::moveParagraphs):
* editing/CompositeEditCommand.h:
* editing/TypingCommand.cpp:
(WebCore::TypingCommand::deleteKeyPressed):

LayoutTests:

* editing/deleting/delete-key-crash-expected.txt: Added.
* editing/deleting/delete-key-crash.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="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandh">trunk/Source/WebCore/editing/CompositeEditCommand.h</a></li>
<li><a href="#trunkSourceWebCoreeditingTypingCommandcpp">trunk/Source/WebCore/editing/TypingCommand.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingdeletingdeletekeycrashexpectedtxt">trunk/LayoutTests/editing/deleting/delete-key-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingdeletingdeletekeycrashhtml">trunk/LayoutTests/editing/deleting/delete-key-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (281794 => 281795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-08-31 08:11:32 UTC (rev 281794)
+++ trunk/LayoutTests/ChangeLog 2021-08-31 08:39:52 UTC (rev 281795)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2021-08-31  Rob Buis  <rbuis@igalia.com>
+
+        Nullptr crash in TypingCommand::willAddTypingToOpenCommand via TypingCommand::deleteKeyPressed
+        https://bugs.webkit.org/show_bug.cgi?id=229277
+
+        Reviewed by Ryosuke Niwa.
+
+        * editing/deleting/delete-key-crash-expected.txt: Added.
+        * editing/deleting/delete-key-crash.html: Added.
+
</ins><span class="cx"> 2021-08-31  Kimmo Kinnunen  <kkinnunen@apple.com>
</span><span class="cx"> 
</span><span class="cx">         webgl/1.0.x/conformance/glsl/misc/fragcolor-fragdata-invariant.html fails
</span></span></pre></div>
<a id="trunkLayoutTestseditingdeletingdeletekeycrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/deleting/delete-key-crash-expected.txt (0 => 281795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/delete-key-crash-expected.txt                         (rev 0)
+++ trunk/LayoutTests/editing/deleting/delete-key-crash-expected.txt    2021-08-31 08:39:52 UTC (rev 281795)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Test passes if it does not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestseditingdeletingdeletekeycrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/deleting/delete-key-crash.html (0 => 281795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/deleting/delete-key-crash.html                         (rev 0)
+++ trunk/LayoutTests/editing/deleting/delete-key-crash.html    2021-08-31 08:39:52 UTC (rev 281795)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<style>
+  html {
+    display: table;
+  }
+</style>
+<script>
+  if (window.testRunner)
+    window.testRunner.dumpAsText();
+  onload = () => {
+    document.designMode = 'on';
+    getSelection().selectAllChildren(document.body);
+    document.execCommand('InsertNestedUnorderedList');
+    document.body.append(document.createElement('div'));
+    document.body.innerHTML += '';
+    document.execCommand('Delete');
+    document.write("Test passes if it does not crash.");
+  };
+</script>
+<body>
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281794 => 281795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-31 08:11:32 UTC (rev 281794)
+++ trunk/Source/WebCore/ChangeLog      2021-08-31 08:39:52 UTC (rev 281795)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2021-08-31  Rob Buis  <rbuis@igalia.com>
+
+        Nullptr crash in TypingCommand::willAddTypingToOpenCommand via TypingCommand::deleteKeyPressed
+        https://bugs.webkit.org/show_bug.cgi?id=229277
+
+        Reviewed by Ryosuke Niwa.
+
+        Rewtite CompositeEditCommand::shouldBreakOutOfEmptyListItem() to return just VisibleSelection
+        and check that it is not none in TypingCommand::willAddTypingToOpenCommand.
+
+        Test: editing/deleting/delete-key-crash.html
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::moveParagraphs):
+        * editing/CompositeEditCommand.h:
+        * editing/TypingCommand.cpp:
+        (WebCore::TypingCommand::deleteKeyPressed):
+
</ins><span class="cx"> 2021-08-31  Ryosuke Niwa  <rniwa@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Re-generalize top layer element concept
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (281794 => 281795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp    2021-08-31 08:11:32 UTC (rev 281794)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp       2021-08-31 08:39:52 UTC (rev 281795)
</span><span class="lines">@@ -1545,11 +1545,11 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-std::optional<VisibleSelection> CompositeEditCommand::shouldBreakOutOfEmptyListItem() const
</del><ins>+VisibleSelection CompositeEditCommand::shouldBreakOutOfEmptyListItem() const
</ins><span class="cx"> {
</span><span class="cx">     auto emptyListItem = enclosingEmptyListItem(endingSelection().visibleStart());
</span><span class="cx">     if (!emptyListItem)
</span><del>-        return std::nullopt;
</del><ins>+        return { };
</ins><span class="cx"> 
</span><span class="cx">     auto listNode = emptyListItem->parentNode();
</span><span class="cx">     // FIXME: Can't we do something better when the immediate parent wasn't a list node?
</span><span class="lines">@@ -1557,7 +1557,7 @@
</span><span class="cx">         || (!listNode->hasTagName(ulTag) && !listNode->hasTagName(olTag))
</span><span class="cx">         || !listNode->hasEditableStyle()
</span><span class="cx">         || listNode == emptyListItem->rootEditableElement())
</span><del>-        return std::nullopt;
</del><ins>+        return { };
</ins><span class="cx"> 
</span><span class="cx">     return VisibleSelection(endingSelection().start().previous(BackwardDeletion), endingSelection().end());
</span><span class="cx"> }
</span><span class="lines">@@ -1565,7 +1565,7 @@
</span><span class="cx"> // FIXME: Send an appropriate shouldDeleteRange call.
</span><span class="cx"> bool CompositeEditCommand::breakOutOfEmptyListItem()
</span><span class="cx"> {
</span><del>-    if (!shouldBreakOutOfEmptyListItem())
</del><ins>+    if (shouldBreakOutOfEmptyListItem().isNone())
</ins><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     auto emptyListItem = enclosingEmptyListItem(endingSelection().visibleStart());
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.h (281794 => 281795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.h      2021-08-31 08:11:32 UTC (rev 281794)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.h 2021-08-31 08:39:52 UTC (rev 281795)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx">     void cloneParagraphUnderNewElement(const Position& start, const Position& end, Node* outerNode, Element* blockElement);
</span><span class="cx">     void cleanupAfterDeletion(VisiblePosition destination = VisiblePosition());
</span><span class="cx">     
</span><del>-    std::optional<VisibleSelection> shouldBreakOutOfEmptyListItem() const;
</del><ins>+    VisibleSelection shouldBreakOutOfEmptyListItem() const;
</ins><span class="cx">     bool breakOutOfEmptyListItem();
</span><span class="cx">     bool breakOutOfEmptyMailBlockquotedParagraph();
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingTypingCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/TypingCommand.cpp (281794 => 281795)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/TypingCommand.cpp   2021-08-31 08:11:32 UTC (rev 281794)
+++ trunk/Source/WebCore/editing/TypingCommand.cpp      2021-08-31 08:39:52 UTC (rev 281795)
</span><span class="lines">@@ -662,8 +662,8 @@
</span><span class="cx">         const Node* enclosingTableCellForPreviousPosition = enclosingNodeOfType(previousPosition.deepEquivalent(), &isTableCell);
</span><span class="cx">         if (previousPosition.isNull() || enclosingTableCell != enclosingTableCellForPreviousPosition) {
</span><span class="cx">             // When the caret is at the start of the editable area in an empty list item, break out of the list item.
</span><del>-            if (auto deleteListSelection = shouldBreakOutOfEmptyListItem()) {
-                if (willAddTypingToOpenCommand(DeleteKey, granularity, { }, *deleteListSelection.value().firstRange())) {
</del><ins>+            if (auto deleteListSelection = shouldBreakOutOfEmptyListItem(); !deleteListSelection.isNone()) {
+                if (willAddTypingToOpenCommand(DeleteKey, granularity, { }, deleteListSelection.firstRange())) {
</ins><span class="cx">                     breakOutOfEmptyListItem();
</span><span class="cx">                     typingAddedToOpenCommand(DeleteKey);
</span><span class="cx">                 }
</span></span></pre>
</div>
</div>

</body>
</html>