<!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>[199424] releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore</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/199424">199424</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-13 01:14:50 -0700 (Wed, 13 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/198478">r198478</a> - Crash in stress/regexp-matches-array-slow-put.js due to stomping on memory when having bad time
https://bugs.webkit.org/show_bug.cgi?id=155679
Reviewed by Saam Barati.
Allocate out of line storage based on what the structure says it needs
in JSArray::tryCreateUninitialized.
* runtime/JSArray.h:
(JSC::JSArray::tryCreateUninitialized):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeJSArrayh">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSArray.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog (199423 => 199424)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-04-13 07:51:42 UTC (rev 199423)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-04-13 08:14:50 UTC (rev 199424)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-20 Michael Saboff <msaboff@apple.com>
+
+ Crash in stress/regexp-matches-array-slow-put.js due to stomping on memory when having bad time
+ https://bugs.webkit.org/show_bug.cgi?id=155679
+
+ Reviewed by Saam Barati.
+
+ Allocate out of line storage based on what the structure says it needs
+ in JSArray::tryCreateUninitialized.
+
+ * runtime/JSArray.h:
+ (JSC::JSArray::tryCreateUninitialized):
+
</ins><span class="cx"> 2016-03-20 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash on DFG::WorkList thread in JSC::Heap::isCollecting for destroyed Web Worker
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreruntimeJSArrayh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSArray.h (199423 => 199424)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSArray.h 2016-04-13 07:51:42 UTC (rev 199423)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/runtime/JSArray.h 2016-04-13 08:14:50 UTC (rev 199424)
</span><span class="lines">@@ -239,7 +239,9 @@
</span><span class="cx"> unsigned vectorLength = std::max(BASE_VECTOR_LEN, initialLength);
</span><span class="cx"> if (vectorLength > MAX_STORAGE_VECTOR_LENGTH)
</span><span class="cx"> return 0;
</span><del>-
</del><ins>+
+ unsigned outOfLineStorage = structure->outOfLineCapacity();
+
</ins><span class="cx"> Butterfly* butterfly;
</span><span class="cx"> if (LIKELY(!hasAnyArrayStorage(structure->indexingType()))) {
</span><span class="cx"> ASSERT(
</span><span class="lines">@@ -249,9 +251,9 @@
</span><span class="cx"> || hasContiguous(structure->indexingType()));
</span><span class="cx">
</span><span class="cx"> void* temp;
</span><del>- if (!vm.heap.tryAllocateStorage(0, Butterfly::totalSize(0, 0, true, vectorLength * sizeof(EncodedJSValue)), &temp))
</del><ins>+ if (!vm.heap.tryAllocateStorage(0, Butterfly::totalSize(0, outOfLineStorage, true, vectorLength * sizeof(EncodedJSValue)), &temp))
</ins><span class="cx"> return 0;
</span><del>- butterfly = Butterfly::fromBase(temp, 0, 0);
</del><ins>+ butterfly = Butterfly::fromBase(temp, 0, outOfLineStorage);
</ins><span class="cx"> butterfly->setVectorLength(vectorLength);
</span><span class="cx"> butterfly->setPublicLength(initialLength);
</span><span class="cx"> if (hasDouble(structure->indexingType())) {
</span><span class="lines">@@ -260,9 +262,9 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> void* temp;
</span><del>- if (!vm.heap.tryAllocateStorage(0, Butterfly::totalSize(0, 0, true, ArrayStorage::sizeFor(vectorLength)), &temp))
</del><ins>+ if (!vm.heap.tryAllocateStorage(0, Butterfly::totalSize(0, outOfLineStorage, true, ArrayStorage::sizeFor(vectorLength)), &temp))
</ins><span class="cx"> return 0;
</span><del>- butterfly = Butterfly::fromBase(temp, 0, 0);
</del><ins>+ butterfly = Butterfly::fromBase(temp, 0, outOfLineStorage);
</ins><span class="cx"> *butterfly->indexingHeader() = indexingHeaderForArray(initialLength, vectorLength);
</span><span class="cx"> ArrayStorage* storage = butterfly->arrayStorage();
</span><span class="cx"> storage->m_indexBias = 0;
</span></span></pre>
</div>
</div>
</body>
</html>