<!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>[282492] releases/WebKitGTK/webkit-2.32</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/282492">282492</a></dd>
<dt>Author</dt> <dd>aperez@igalia.com</dd>
<dt>Date</dt> <dd>2021-09-16 00:35:49 -0700 (Thu, 16 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/275320">r275320</a> - Null pointer access crash in WebCore::makeBoundaryPoint(..)
https://bugs.webkit.org/show_bug.cgi?id=223977

Patch by Venky Dass <yaranamavenkataramana@apple.com> on 2021-03-31
Reviewed by Darin Adler.

Source/WebCore:

In makeBoundaryPoint, position.containerNode() can be nullptr even if position.isNull() was false

Test: LayoutTests/editing/inserting/crash-make-boundary-point.html

* dom/Position.cpp:
(WebCore::makeBoundaryPoint):

LayoutTests:

Adding a refression test case.

* editing/inserting/crash-make-boundary-point-expected.txt: Added.
* editing/inserting/crash-make-boundary-point.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit232LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit232SourceWebCoredomPositioncpp">releases/WebKitGTK/webkit-2.32/Source/WebCore/dom/Position.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit232LayoutTestseditinginsertingcrashmakeboundarypointexpectedtxt">releases/WebKitGTK/webkit-2.32/LayoutTests/editing/inserting/crash-make-boundary-point-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit232LayoutTestseditinginsertingcrashmakeboundarypointhtml">releases/WebKitGTK/webkit-2.32/LayoutTests/editing/inserting/crash-make-boundary-point.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit232LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog (282491 => 282492)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog     2021-09-16 07:34:18 UTC (rev 282491)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/ChangeLog        2021-09-16 07:35:49 UTC (rev 282492)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-03-31  Venky Dass  <yaranamavenkataramana@apple.com>
+
+        Null pointer access crash in WebCore::makeBoundaryPoint(..)
+        https://bugs.webkit.org/show_bug.cgi?id=223977
+
+        Reviewed by Darin Adler.
+
+        Adding a refression test case.
+
+        * editing/inserting/crash-make-boundary-point-expected.txt: Added.
+        * editing/inserting/crash-make-boundary-point.html: Added.
+
</ins><span class="cx"> 2021-03-29  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r274992): Nullptr crash in FontCache::retrieveOrAddCachedFonts
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232LayoutTestseditinginsertingcrashmakeboundarypointexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.32/LayoutTests/editing/inserting/crash-make-boundary-point-expected.txt (0 => 282492)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/LayoutTests/editing/inserting/crash-make-boundary-point-expected.txt                              (rev 0)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/editing/inserting/crash-make-boundary-point-expected.txt 2021-09-16 07:35:49 UTC (rev 282492)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS. WebKit did not crash.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit232LayoutTestseditinginsertingcrashmakeboundarypointhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.32/LayoutTests/editing/inserting/crash-make-boundary-point.html (0 => 282492)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/LayoutTests/editing/inserting/crash-make-boundary-point.html                              (rev 0)
+++ releases/WebKitGTK/webkit-2.32/LayoutTests/editing/inserting/crash-make-boundary-point.html 2021-09-16 07:35:49 UTC (rev 282492)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+  style, script, head {
+    display: block;
+  }
+</style>
+<script>
+function runTest()
+{
+  document.documentElement.appendChild(document.createElement('input'));
+  document.execCommand('SelectAll');
+  document.designMode = 'on';
+  document.execCommand('JustifyRight');
+  document.execCommand('FormatBlock', false, 'div');
+  if (window.testRunner)
+      testRunner.dumpAsText();
+  document.documentElement.textContent = 'PASS. WebKit did not crash.';
+}
+window.onload = runTest;
+</script>
+</head>
+<body></body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog (282491 => 282492)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog  2021-09-16 07:34:18 UTC (rev 282491)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/ChangeLog     2021-09-16 07:35:49 UTC (rev 282492)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-03-31  Venky Dass  <yaranamavenkataramana@apple.com>
+
+        Null pointer access crash in WebCore::makeBoundaryPoint(..)
+        https://bugs.webkit.org/show_bug.cgi?id=223977
+
+        Reviewed by Darin Adler.
+
+        In makeBoundaryPoint, position.containerNode() can be nullptr even if position.isNull() was false 
+
+        Test: LayoutTests/editing/inserting/crash-make-boundary-point.html
+
+        * dom/Position.cpp:
+        (WebCore::makeBoundaryPoint):
+
</ins><span class="cx"> 2021-08-21  Sihui Liu  <sihui_liu@apple.com>
</span><span class="cx"> 
</span><span class="cx">         IndexedDB: crash when triggering IDBOpenRequest completion back on a worker thread
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit232SourceWebCoredomPositioncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.32/Source/WebCore/dom/Position.cpp (282491 => 282492)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.32/Source/WebCore/dom/Position.cpp   2021-09-16 07:34:18 UTC (rev 282491)
+++ releases/WebKitGTK/webkit-2.32/Source/WebCore/dom/Position.cpp      2021-09-16 07:35:49 UTC (rev 282492)
</span><span class="lines">@@ -1594,9 +1594,10 @@
</span><span class="cx"> 
</span><span class="cx"> Optional<BoundaryPoint> makeBoundaryPoint(const Position& position)
</span><span class="cx"> {
</span><del>-    if (position.isNull())
</del><ins>+    auto container = makeRefPtr(position.containerNode());
+    if (!container)
</ins><span class="cx">         return WTF::nullopt;
</span><del>-    return BoundaryPoint { *position.containerNode(), static_cast<unsigned>(position.computeOffsetInContainerNode()) };
</del><ins>+    return BoundaryPoint { container.releaseNonNull(), static_cast<unsigned>(position.computeOffsetInContainerNode()) };
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> PartialOrdering documentOrder(const Position& a, const Position& b)
</span></span></pre>
</div>
</div>

</body>
</html>