<!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>[214812] releases/WebKitGTK/webkit-2.16/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/214812">214812</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-04-03 10:20:10 -0700 (Mon, 03 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/214637">r214637</a> - IntlObject should not be using JSArray::initializeIndex().
https://bugs.webkit.org/show_bug.cgi?id=170302
<rdar://problem/31356918>
Reviewed by Saam Barati.
JSArray::initializeIndex() is only meant to be used with arrays created using
JSArray::tryCreateForInitializationPrivate() under very constrained conditions.
* runtime/IntlObject.cpp:
(JSC::canonicalizeLocaleList):
(JSC::intlObjectFuncGetCanonicalLocales):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceJavaScriptCoreruntimeIntlObjectcpp">releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/runtime/IntlObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/ChangeLog (214811 => 214812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/ChangeLog 2017-04-03 17:15:03 UTC (rev 214811)
+++ releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/ChangeLog 2017-04-03 17:20:10 UTC (rev 214812)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-30 Mark Lam <mark.lam@apple.com>
+
+ IntlObject should not be using JSArray::initializeIndex().
+ https://bugs.webkit.org/show_bug.cgi?id=170302
+ <rdar://problem/31356918>
+
+ Reviewed by Saam Barati.
+
+ JSArray::initializeIndex() is only meant to be used with arrays created using
+ JSArray::tryCreateForInitializationPrivate() under very constrained conditions.
+
+ * runtime/IntlObject.cpp:
+ (JSC::canonicalizeLocaleList):
+ (JSC::intlObjectFuncGetCanonicalLocales):
+
</ins><span class="cx"> 2017-03-28 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> The Mutator should not be able to steal the conn if the Collector hasn't reached the NotRunning phase yet.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceJavaScriptCoreruntimeIntlObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/runtime/IntlObject.cpp (214811 => 214812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/runtime/IntlObject.cpp 2017-04-03 17:15:03 UTC (rev 214811)
+++ releases/WebKitGTK/webkit-2.16/Source/JavaScriptCore/runtime/IntlObject.cpp 2017-04-03 17:20:10 UTC (rev 214812)
</span><span class="lines">@@ -548,13 +548,15 @@
</span><span class="cx"> JSObject* localesObject;
</span><span class="cx"> if (locales.isString()) {
</span><span class="cx"> // a. Let aLocales be CreateArrayFromList(«locales»).
</span><del>- JSArray* localesArray = JSArray::tryCreate(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithContiguous), 1);
</del><ins>+ JSArray* localesArray = JSArray::tryCreate(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithContiguous));
</ins><span class="cx"> if (!localesArray) {
</span><span class="cx"> throwOutOfMemoryError(&state, scope);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, Vector<String>());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- localesArray->initializeIndex(vm, 0, locales);
</del><ins>+ localesArray->push(&state, locales);
+ RETURN_IF_EXCEPTION(scope, Vector<String>());
+
</ins><span class="cx"> // 4. Let O be ToObject(aLocales).
</span><span class="cx"> localesObject = localesArray;
</span><span class="cx"> } else {
</span><span class="lines">@@ -1036,7 +1038,7 @@
</span><span class="cx">
</span><span class="cx"> // 2. Return CreateArrayFromList(ll).
</span><span class="cx"> JSGlobalObject* globalObject = state->jsCallee()->globalObject();
</span><del>- JSArray* localeArray = JSArray::tryCreate(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithContiguous), localeList.size());
</del><ins>+ JSArray* localeArray = JSArray::tryCreate(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithContiguous));
</ins><span class="cx"> if (!localeArray) {
</span><span class="cx"> throwOutOfMemoryError(state, scope);
</span><span class="cx"> return encodedJSValue();
</span><span class="lines">@@ -1044,7 +1046,7 @@
</span><span class="cx">
</span><span class="cx"> auto length = localeList.size();
</span><span class="cx"> for (size_t i = 0; i < length; ++i) {
</span><del>- localeArray->initializeIndex(vm, i, jsString(state, localeList[i]));
</del><ins>+ localeArray->push(state, jsString(state, localeList[i]));
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> }
</span><span class="cx"> return JSValue::encode(localeArray);
</span></span></pre>
</div>
</div>
</body>
</html>