<!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>[189318] branches/safari-601-branch</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/189318">189318</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-09-03 16:42:32 -0700 (Thu, 03 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/189046">r189046</a>. rdar://problem/22542832</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreChangeLog">branches/safari-601-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoredfgDFGClobberizeh">branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGClobberize.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsjsregress148411expectedtxt">branches/safari-601-branch/LayoutTests/js/regress-148411-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsjsregress148411html">branches/safari-601-branch/LayoutTests/js/regress-148411.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsjsscripttestsregress148411js">branches/safari-601-branch/LayoutTests/js/script-tests/regress-148411.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (189317 => 189318)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-09-03 23:41:22 UTC (rev 189317)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-09-03 23:42:32 UTC (rev 189318)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-09-03 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189046.
+
+ 2015-08-27 Basile Clement <basile_clement@apple.com>
+
+ REGRESSION(r184779): Possible read-after-free in JavaScriptCore/dfg/DFGClobberize.h
+ https://bugs.webkit.org/show_bug.cgi?id=148411
+
+ Reviewed by Geoffrey Garen and Filip Pizlo.
+
+ * js/regress-148411-expected.txt: Added.
+ * js/regress-148411.html: Added.
+ * js/script-tests/regress-148411.js: Added.
+ (foo):
+
+2015-09-03 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r188340.
</span><span class="cx">
</span><span class="cx"> 2015-08-12 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsjsregress148411expectedtxtfromrev189046trunkLayoutTestsjsregress148411expectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/js/regress-148411-expected.txt (from rev 189046, trunk/LayoutTests/js/regress-148411-expected.txt) (0 => 189318)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/js/regress-148411-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/js/regress-148411-expected.txt 2015-09-03 23:42:32 UTC (rev 189318)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Regression test for https://webkit.org/b/148411. This test should not crash.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsjsregress148411htmlfromrev189046trunkLayoutTestsjsregress148411html"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/js/regress-148411.html (from rev 189046, trunk/LayoutTests/js/regress-148411.html) (0 => 189318)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/js/regress-148411.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/js/regress-148411.html 2015-09-03 23:42:32 UTC (rev 189318)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/regress-148411.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsjsscripttestsregress148411jsfromrev189046trunkLayoutTestsjsscripttestsregress148411js"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/js/script-tests/regress-148411.js (from rev 189046, trunk/LayoutTests/js/script-tests/regress-148411.js) (0 => 189318)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/js/script-tests/regress-148411.js (rev 0)
+++ branches/safari-601-branch/LayoutTests/js/script-tests/regress-148411.js 2015-09-03 23:42:32 UTC (rev 189318)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+description(
+"Regression test for https://webkit.org/b/148411. This test should not crash."
+);
+
+function foo()
+{
+ [5, 6, 7, 8];
+ [100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114];
+}
+
+for (var i = 0; i < 100000; ++i)
+ foo();
</ins></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/ChangeLog (189317 => 189318)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-09-03 23:41:22 UTC (rev 189317)
+++ branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-09-03 23:42:32 UTC (rev 189318)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-09-03 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r189046.
+
+ 2015-08-27 Basile Clement <basile_clement@apple.com>
+
+ REGRESSION(r184779): Possible read-after-free in JavaScriptCore/dfg/DFGClobberize.h
+ https://bugs.webkit.org/show_bug.cgi?id=148411
+
+ Reviewed by Geoffrey Garen and Filip Pizlo.
+
+ * dfg/DFGClobberize.h:
+ (JSC::DFG::clobberize):
+
+2015-09-03 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r188311.
</span><span class="cx">
</span><span class="cx"> 2015-08-11 Alexey Proskuryakov <ap@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoredfgDFGClobberizeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGClobberize.h (189317 => 189318)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-09-03 23:41:22 UTC (rev 189317)
+++ branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGClobberize.h 2015-09-03 23:42:32 UTC (rev 189318)
</span><span class="lines">@@ -888,6 +888,7 @@
</span><span class="cx"> if (operandIdx >= numElements)
</span><span class="cx"> continue;
</span><span class="cx"> Edge use = graph.m_varArgChildren[node->firstChild() + operandIdx];
</span><ins>+ // operandIdx comes from graph.m_uint32ValuesInUse and thus is guaranteed to be already frozen
</ins><span class="cx"> def(HeapLocation(IndexedPropertyLoc, heap, node, LazyNode(graph.freeze(jsNumber(operandIdx)))),
</span><span class="cx"> LazyNode(use.node()));
</span><span class="cx"> }
</span><span class="lines">@@ -930,9 +931,13 @@
</span><span class="cx"> LazyNode(graph.freeze(data[index]), op));
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><ins>+ Vector<uint32_t> possibleIndices;
</ins><span class="cx"> for (uint32_t index : graph.m_uint32ValuesInUse) {
</span><span class="cx"> if (index >= numElements)
</span><span class="cx"> continue;
</span><ins>+ possibleIndices.append(index);
+ }
+ for (uint32_t index : possibleIndices) {
</ins><span class="cx"> def(HeapLocation(IndexedPropertyLoc, heap, node, LazyNode(graph.freeze(jsNumber(index)))),
</span><span class="cx"> LazyNode(graph.freeze(data[index]), op));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>