<!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>[247969] branches/safari-608-branch/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/247969">247969</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2019-07-29 20:55:05 -0700 (Mon, 29 Jul 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/247734">r247734</a>. rdar://problem/53575394

    Fix crashes in ScrollingStateNode::insertChild()
    https://bugs.webkit.org/show_bug.cgi?id=200023
    rdar://problem/53265378

    Reviewed by Darin Adler.

    Crash data suggest that ScrollingStateNode::insertChild() can be passed an index that
    is larger than the size of the vector, causing crashes.

    Fix defensively by falling back to append() if the passed index is equal to or larger
    than the size of the children vector.

    * page/scrolling/ScrollingStateNode.cpp:
    (WebCore::ScrollingStateNode::insertChild):

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247734 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari608branchSourceWebCoreChangeLog">branches/safari-608-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari608branchSourceWebCorepagescrollingScrollingStateNodecpp">branches/safari-608-branch/Source/WebCore/page/scrolling/ScrollingStateNode.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari608branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608-branch/Source/WebCore/ChangeLog (247968 => 247969)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608-branch/Source/WebCore/ChangeLog      2019-07-30 03:55:03 UTC (rev 247968)
+++ branches/safari-608-branch/Source/WebCore/ChangeLog 2019-07-30 03:55:05 UTC (rev 247969)
</span><span class="lines">@@ -1,5 +1,43 @@
</span><span class="cx"> 2019-07-29  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r247734. rdar://problem/53575394
+
+    Fix crashes in ScrollingStateNode::insertChild()
+    https://bugs.webkit.org/show_bug.cgi?id=200023
+    rdar://problem/53265378
+    
+    Reviewed by Darin Adler.
+    
+    Crash data suggest that ScrollingStateNode::insertChild() can be passed an index that
+    is larger than the size of the vector, causing crashes.
+    
+    Fix defensively by falling back to append() if the passed index is equal to or larger
+    than the size of the children vector.
+    
+    * page/scrolling/ScrollingStateNode.cpp:
+    (WebCore::ScrollingStateNode::insertChild):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247734 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-07-22  Simon Fraser  <simon.fraser@apple.com>
+
+            Fix crashes in ScrollingStateNode::insertChild()
+            https://bugs.webkit.org/show_bug.cgi?id=200023
+            rdar://problem/53265378
+
+            Reviewed by Darin Adler.
+
+            Crash data suggest that ScrollingStateNode::insertChild() can be passed an index that
+            is larger than the size of the vector, causing crashes.
+
+            Fix defensively by falling back to append() if the passed index is equal to or larger
+            than the size of the children vector.
+
+            * page/scrolling/ScrollingStateNode.cpp:
+            (WebCore::ScrollingStateNode::insertChild):
+
+2019-07-29  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r247730. rdar://problem/53647886
</span><span class="cx"> 
</span><span class="cx">     Long press hint of AirPods buy buttons are tall and narrow during animation
</span></span></pre></div>
<a id="branchessafari608branchSourceWebCorepagescrollingScrollingStateNodecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-608-branch/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (247968 => 247969)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608-branch/Source/WebCore/page/scrolling/ScrollingStateNode.cpp  2019-07-30 03:55:03 UTC (rev 247968)
+++ branches/safari-608-branch/Source/WebCore/page/scrolling/ScrollingStateNode.cpp     2019-07-30 03:55:05 UTC (rev 247969)
</span><span class="lines">@@ -116,7 +116,12 @@
</span><span class="cx">         m_children = std::make_unique<Vector<RefPtr<ScrollingStateNode>>>();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    m_children->insert(index, WTFMove(childNode));
</del><ins>+    if (index > m_children->size()) {
+        ASSERT_NOT_REACHED();  // Crash data suggest we can get here.
+        m_children->append(WTFMove(childNode));
+    } else
+        m_children->insert(index, WTFMove(childNode));
+    
</ins><span class="cx">     setPropertyChanged(ChildNodes);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>