<!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>[280905] releases/WebKitGTK/webkit-2.32/Source/WebCore</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/280905">280905</a></dd>
<dt>Author</dt> <dd>aperez@igalia.com</dd>
<dt>Date</dt> <dd>2021-08-11 04:24:27 -0700 (Wed, 11 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/274862">r274862</a> - Nullptr crash in HTMLConverter::convert
https://bugs.webkit.org/show_bug.cgi?id=221719

Patch by Frédéric Wang <fwang@igalia.com> on 2021-03-23
Reviewed by Ryosuke Niwa.

When the "Undo" command is called after DOM changes, one of the selection's position anchors
may have been moved to a new document. In that case, just clear the selection. Also add
asserts to ensure the selection is in good state after unapply and reapply commands.

* editing/CompositeEditCommand.cpp:
(WebCore::EditCommandComposition::unapply): Add security assert to ensure selection is in
good state.
(WebCore::EditCommandComposition::reapply): Ditto.
* editing/FrameSelection.cpp:
(WebCore::FrameSelection::setSelectionWithoutUpdatingAppearance): If the selection's
position anchors have been moved to a new document then just clear the selection.
(WebCore::FrameSelection::isConnectedToDocument const): New method to verify that all the
positions of the visible selection are in m_document.
* editing/FrameSelection.h: Declare new method.
* editing/VisibleSelection.cpp:
(WebCore::VisibleSelection::document const): New method that returns a common document for
all positions or nullptr otherwise.
* editing/VisibleSelection.h: Declare new method.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreeditingCompositeEditCommandcpp">releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreeditingFrameSelectioncpp">releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/FrameSelection.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreeditingFrameSelectionh">releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/FrameSelection.h</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreeditingVisibleSelectioncpp">releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/VisibleSelection.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreeditingVisibleSelectionh">releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/VisibleSelection.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit232SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (280904 => 280905)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog  2021-08-11 11:20:55 UTC (rev 280904)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog     2021-08-11 11:24:27 UTC (rev 280905)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2021-03-23  Frédéric Wang  <fwang@igalia.com>
+
+        Nullptr crash in HTMLConverter::convert
+        https://bugs.webkit.org/show_bug.cgi?id=221719
+
+        Reviewed by Ryosuke Niwa.
+
+        When the "Undo" command is called after DOM changes, one of the selection's position anchors
+        may have been moved to a new document. In that case, just clear the selection. Also add
+        asserts to ensure the selection is in good state after unapply and reapply commands.
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::EditCommandComposition::unapply): Add security assert to ensure selection is in
+        good state.
+        (WebCore::EditCommandComposition::reapply): Ditto.
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::setSelectionWithoutUpdatingAppearance): If the selection's
+        position anchors have been moved to a new document then just clear the selection.
+        (WebCore::FrameSelection::isConnectedToDocument const): New method to verify that all the
+        positions of the visible selection are in m_document.
+        * editing/FrameSelection.h: Declare new method.
+        * editing/VisibleSelection.cpp:
+        (WebCore::VisibleSelection::document const): New method that returns a common document for
+        all positions or nullptr otherwise.
+        * editing/VisibleSelection.h: Declare new method.
+
</ins><span class="cx"> 2021-03-22  Venky Dass  <yaranamavenkataramana@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Nullptr crash in  WebCore::RenderObject::RenderObjectBitfields::isLineBreak() where a NULL check is missing.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/CompositeEditCommand.cpp (280904 => 280905)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/CompositeEditCommand.cpp   2021-08-11 11:20:55 UTC (rev 280904)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/CompositeEditCommand.cpp      2021-08-11 11:24:27 UTC (rev 280905)
</span><span class="lines">@@ -243,6 +243,8 @@
</span><span class="cx"> 
</span><span class="cx">     if (AXObjectCache::accessibilityEnabled())
</span><span class="cx">         m_replacedText.postTextStateChangeNotificationForUnapply(m_document->existingAXObjectCache());
</span><ins>+
+    RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(m_document->selection().isNone() || m_document->selection().isConnectedToDocument());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void EditCommandComposition::reapply()
</span><span class="lines">@@ -270,6 +272,8 @@
</span><span class="cx"> 
</span><span class="cx">     if (AXObjectCache::accessibilityEnabled())
</span><span class="cx">         m_replacedText.postTextStateChangeNotificationForReapply(m_document->existingAXObjectCache());
</span><ins>+
+    RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(m_document->selection().isNone() || m_document->selection().isConnectedToDocument());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void EditCommandComposition::append(SimpleEditCommand* command)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/FrameSelection.cpp (280904 => 280905)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/FrameSelection.cpp 2021-08-11 11:20:55 UTC (rev 280904)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/FrameSelection.cpp    2021-08-11 11:24:27 UTC (rev 280905)
</span><span class="lines">@@ -369,6 +369,13 @@
</span><span class="cx">             return false;
</span><span class="cx">         }
</span><span class="cx"> 
</span><ins>+        bool selectionEndpointsBelongToMultipleDocuments = newSelection.base().document() && !newSelection.document();
+        bool selectionIsInAnotherDocument = newSelection.document() && newSelection.document() != m_document.get();
+        if (selectionEndpointsBelongToMultipleDocuments || selectionIsInAnotherDocument) {
+            clear();
+            return false;
+        }
+
</ins><span class="cx">         if (closeTyping)
</span><span class="cx">             TypingCommand::closeTyping(*m_document);
</span><span class="cx"> 
</span><span class="lines">@@ -2793,6 +2800,11 @@
</span><span class="cx">     return containsEndpoints(m_document, m_selection.range());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool FrameSelection::isConnectedToDocument() const
+{
+    return selection().document() == m_document.get();
+}
+
</ins><span class="cx"> RefPtr<Range> FrameSelection::associatedLiveRange()
</span><span class="cx"> {
</span><span class="cx">     if (!m_associatedLiveRange) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebCoreeditingFrameSelectionh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/FrameSelection.h (280904 => 280905)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/FrameSelection.h   2021-08-11 11:20:55 UTC (rev 280904)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/FrameSelection.h      2021-08-11 11:24:27 UTC (rev 280905)
</span><span class="lines">@@ -252,6 +252,8 @@
</span><span class="cx">     void setShouldShowBlockCursor(bool);
</span><span class="cx"> 
</span><span class="cx">     bool isInDocumentTree() const;
</span><ins>+    bool isConnectedToDocument() const;
+
</ins><span class="cx">     RefPtr<Range> associatedLiveRange();
</span><span class="cx">     void associateLiveRange(Range&);
</span><span class="cx">     void disassociateLiveRange();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebCoreeditingVisibleSelectioncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/VisibleSelection.cpp (280904 => 280905)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/VisibleSelection.cpp       2021-08-11 11:20:55 UTC (rev 280904)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/VisibleSelection.cpp  2021-08-11 11:24:27 UTC (rev 280905)
</span><span class="lines">@@ -144,6 +144,21 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+RefPtr<Document> VisibleSelection::document() const
+{
+    auto baseDocument = makeRefPtr(m_base.document());
+    if (!baseDocument)
+        return nullptr;
+
+    if (m_extent.document() != baseDocument.get() || m_start.document() != baseDocument.get() || m_end.document() != baseDocument.get())
+        return nullptr;
+
+    if (baseDocument->settings().liveRangeSelectionEnabled() && (m_anchor.document() != baseDocument.get() || m_focus.document() != baseDocument.get()))
+        return nullptr;
+
+    return baseDocument;
+}
+
</ins><span class="cx"> Optional<SimpleRange> VisibleSelection::firstRange() const
</span><span class="cx"> {
</span><span class="cx">     if (isNoneOrOrphaned())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebCoreeditingVisibleSelectionh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/VisibleSelection.h (280904 => 280905)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/VisibleSelection.h 2021-08-11 11:20:55 UTC (rev 280904)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/editing/VisibleSelection.h    2021-08-11 11:24:27 UTC (rev 280905)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx">     bool isNonOrphanedRange() const { return isRange() && !start().isOrphan() && !end().isOrphan(); }
</span><span class="cx">     bool isNoneOrOrphaned() const { return isNone() || start().isOrphan() || end().isOrphan(); }
</span><span class="cx">     bool isOrphan() const;
</span><ins>+    RefPtr<Document> document() const;
</ins><span class="cx"> 
</span><span class="cx">     bool isBaseFirst() const { return m_anchorIsFirst; }
</span><span class="cx">     bool isDirectional() const { return m_isDirectional; }
</span></span></pre>
</div>
</div>

</body>
</html>