<!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>[211043] trunk/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/211043">211043</a></dd>
<dt>Author</dt> <dd>msaboff@apple.com</dd>
<dt>Date</dt> <dd>2017-01-23 10:45:17 -0800 (Mon, 23 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>IntlObject uses JSArray::tryCreateUninitialized in an unsafe way
https://bugs.webkit.org/show_bug.cgi?id=167288
Reviewed by Filip Pizlo.
Refactored the following "create" methods into a "tryCreate" method and a
"create" wrapper: JSArray::create(), Butterfly::create() and
createArrayButterfly().
Changed IntlObject.cpp to use JSArray::tryCreate() as it is simpler to use
by not requiring the caller to be GC savey. The performance benefits of
tryCreateUninitialized() are not needed by the IntlObject c++ code.
Did not add a new test as the bug caused LayoutTests/js/intl.html to fail
reliably with the JSC option values scribbleFreeCells=true,
collectContinuously=true and JSC_useGenerationalGC=false.
* runtime/Butterfly.h:
* runtime/ButterflyInlines.h:
(JSC::Butterfly::tryCreate): Added.
(JSC::Butterfly::create):
* runtime/IntlObject.cpp:
(JSC::canonicalizeLocaleList):
(JSC::lookupSupportedLocales):
(JSC::intlObjectFuncGetCanonicalLocales):
* runtime/JSArray.h:
(JSC::createContiguousArrayButterfly): Deleted.
(JSC::tryCreateArrayButterfly): Added.
(JSC::createArrayButterfly):
(JSC::JSArray::tryCreate): Added.
(JSC::JSArray::create):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeButterflyh">trunk/Source/JavaScriptCore/runtime/Butterfly.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeButterflyInlinesh">trunk/Source/JavaScriptCore/runtime/ButterflyInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlObjectcpp">trunk/Source/JavaScriptCore/runtime/IntlObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSArrayh">trunk/Source/JavaScriptCore/runtime/JSArray.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (211042 => 211043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-01-23 18:39:48 UTC (rev 211042)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-01-23 18:45:17 UTC (rev 211043)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2017-01-23 Michael Saboff <msaboff@apple.com>
+
+ IntlObject uses JSArray::tryCreateUninitialized in an unsafe way
+ https://bugs.webkit.org/show_bug.cgi?id=167288
+
+ Reviewed by Filip Pizlo.
+
+ Refactored the following "create" methods into a "tryCreate" method and a
+ "create" wrapper: JSArray::create(), Butterfly::create() and
+ createArrayButterfly().
+
+ Changed IntlObject.cpp to use JSArray::tryCreate() as it is simpler to use
+ by not requiring the caller to be GC savey. The performance benefits of
+ tryCreateUninitialized() are not needed by the IntlObject c++ code.
+
+ Did not add a new test as the bug caused LayoutTests/js/intl.html to fail
+ reliably with the JSC option values scribbleFreeCells=true,
+ collectContinuously=true and JSC_useGenerationalGC=false.
+
+ * runtime/Butterfly.h:
+ * runtime/ButterflyInlines.h:
+ (JSC::Butterfly::tryCreate): Added.
+ (JSC::Butterfly::create):
+ * runtime/IntlObject.cpp:
+ (JSC::canonicalizeLocaleList):
+ (JSC::lookupSupportedLocales):
+ (JSC::intlObjectFuncGetCanonicalLocales):
+ * runtime/JSArray.h:
+ (JSC::createContiguousArrayButterfly): Deleted.
+ (JSC::tryCreateArrayButterfly): Added.
+ (JSC::createArrayButterfly):
+ (JSC::JSArray::tryCreate): Added.
+ (JSC::JSArray::create):
+
</ins><span class="cx"> 2017-01-23 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> JavaScriptCore has a weak external symbol in it
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeButterflyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Butterfly.h (211042 => 211043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Butterfly.h 2017-01-23 18:39:48 UTC (rev 211042)
+++ trunk/Source/JavaScriptCore/runtime/Butterfly.h 2017-01-23 18:45:17 UTC (rev 211043)
</span><span class="lines">@@ -111,6 +111,7 @@
</span><span class="cx">
</span><span class="cx"> static Butterfly* createUninitialized(VM&, JSCell* intendedOwner, size_t preCapacity, size_t propertyCapacity, bool hasIndexingHeader, size_t indexingPayloadSizeInBytes);
</span><span class="cx">
</span><ins>+ static Butterfly* tryCreate(VM& vm, JSCell*, size_t preCapacity, size_t propertyCapacity, bool hasIndexingHeader, const IndexingHeader& indexingHeader, size_t indexingPayloadSizeInBytes);
</ins><span class="cx"> static Butterfly* create(VM&, JSCell* intendedOwner, size_t preCapacity, size_t propertyCapacity, bool hasIndexingHeader, const IndexingHeader&, size_t indexingPayloadSizeInBytes);
</span><span class="cx"> static Butterfly* create(VM&, JSCell* intendedOwner, Structure*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeButterflyInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ButterflyInlines.h (211042 => 211043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ButterflyInlines.h 2017-01-23 18:39:48 UTC (rev 211042)
+++ trunk/Source/JavaScriptCore/runtime/ButterflyInlines.h 2017-01-23 18:45:17 UTC (rev 211043)
</span><span class="lines">@@ -67,11 +67,13 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Butterfly* Butterfly::create(VM& vm, JSCell* intendedOwner, size_t preCapacity, size_t propertyCapacity, bool hasIndexingHeader, const IndexingHeader& indexingHeader, size_t indexingPayloadSizeInBytes)
</del><ins>+inline Butterfly* Butterfly::tryCreate(VM& vm, JSCell*, size_t preCapacity, size_t propertyCapacity, bool hasIndexingHeader, const IndexingHeader& indexingHeader, size_t indexingPayloadSizeInBytes)
</ins><span class="cx"> {
</span><del>- Butterfly* result = createUninitialized(
- vm, intendedOwner, preCapacity, propertyCapacity, hasIndexingHeader,
- indexingPayloadSizeInBytes);
</del><ins>+ size_t size = totalSize(preCapacity, propertyCapacity, hasIndexingHeader, indexingPayloadSizeInBytes);
+ void* base = vm.auxiliarySpace.tryAllocate(size);
+ if (!base)
+ return nullptr;
+ Butterfly* result = fromBase(base, preCapacity, propertyCapacity);
</ins><span class="cx"> if (hasIndexingHeader)
</span><span class="cx"> *result->indexingHeader() = indexingHeader;
</span><span class="cx"> memset(result->propertyStorage() - propertyCapacity, 0, propertyCapacity * sizeof(EncodedJSValue));
</span><span class="lines">@@ -78,6 +80,14 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline Butterfly* Butterfly::create(VM& vm, JSCell* intendedOwner, size_t preCapacity, size_t propertyCapacity, bool hasIndexingHeader, const IndexingHeader& indexingHeader, size_t indexingPayloadSizeInBytes)
+{
+ Butterfly* result = tryCreate(vm, intendedOwner, preCapacity, propertyCapacity, hasIndexingHeader, indexingHeader, indexingPayloadSizeInBytes);
+
+ RELEASE_ASSERT(result);
+ return result;
+}
+
</ins><span class="cx"> inline Butterfly* Butterfly::create(VM& vm, JSCell* intendedOwner, Structure* structure)
</span><span class="cx"> {
</span><span class="cx"> return create(
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlObject.cpp (211042 => 211043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlObject.cpp 2017-01-23 18:39:48 UTC (rev 211042)
+++ trunk/Source/JavaScriptCore/runtime/IntlObject.cpp 2017-01-23 18:45:17 UTC (rev 211043)
</span><span class="lines">@@ -548,7 +548,12 @@
</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::tryCreateUninitialized(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithContiguous), 1);
</del><ins>+ JSArray* localesArray = JSArray::tryCreate(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithContiguous), 1);
+ if (!localesArray) {
+ throwOutOfMemoryError(&state, scope);
+ RETURN_IF_EXCEPTION(scope, Vector<String>());
+ }
+
</ins><span class="cx"> localesArray->initializeIndex(vm, 0, locales);
</span><span class="cx"> // 4. Let O be ToObject(aLocales).
</span><span class="cx"> localesObject = localesArray;
</span><span class="lines">@@ -887,7 +892,7 @@
</span><span class="cx">
</span><span class="cx"> // 3. Let subset be an empty List.
</span><span class="cx"> JSGlobalObject* globalObject = state.jsCallee()->globalObject();
</span><del>- JSArray* subset = JSArray::tryCreateUninitialized(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithUndecided), 0);
</del><ins>+ JSArray* subset = JSArray::tryCreate(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithUndecided), 0);
</ins><span class="cx"> if (!subset) {
</span><span class="cx"> throwOutOfMemoryError(&state, scope);
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1031,7 +1036,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::tryCreateUninitialized(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithContiguous), localeList.size());
</del><ins>+ JSArray* localeArray = JSArray::tryCreate(vm, globalObject->arrayStructureForIndexingTypeDuringAllocation(ArrayWithContiguous), localeList.size());
</ins><span class="cx"> if (!localeArray) {
</span><span class="cx"> throwOutOfMemoryError(state, scope);
</span><span class="cx"> return encodedJSValue();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSArray.h (211042 => 211043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSArray.h 2017-01-23 18:39:48 UTC (rev 211042)
+++ trunk/Source/JavaScriptCore/runtime/JSArray.h 2017-01-23 18:45:17 UTC (rev 211043)
</span><span class="lines">@@ -52,13 +52,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public:
</span><ins>+ static JSArray* tryCreate(VM&, Structure*, unsigned initialLength = 0);
</ins><span class="cx"> static JSArray* create(VM&, Structure*, unsigned initialLength = 0);
</span><span class="cx"> static JSArray* createWithButterfly(VM&, GCDeferralContext*, Structure*, Butterfly*);
</span><span class="cx">
</span><span class="cx"> // tryCreateUninitialized is used for fast construction of arrays whose size and
</span><del>- // contents are known at time of creation. Clients of this interface must:
</del><ins>+ // contents are known at time of creation. This should be considered a private API.
+ // Clients of this interface must:
</ins><span class="cx"> // - null-check the result (indicating out of memory, or otherwise unable to allocate vector).
</span><span class="cx"> // - call 'initializeIndex' for all properties in sequence, for 0 <= i < initialLength.
</span><ins>+ // - Provide a valid GCDefferalContext* if they might garbage collect when initializing properties,
+ // otherwise the caller can provide a null GCDefferalContext*.
+ //
</ins><span class="cx"> JS_EXPORT_PRIVATE static JSArray* tryCreateUninitialized(VM&, GCDeferralContext*, Structure*, unsigned initialLength);
</span><span class="cx"> static JSArray* tryCreateUninitialized(VM& vm, Structure* structure, unsigned initialLength)
</span><span class="cx"> {
</span><span class="lines">@@ -183,23 +188,13 @@
</span><span class="cx"> void setLengthWritable(ExecState*, bool writable);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline Butterfly* createContiguousArrayButterfly(VM& vm, JSCell* intendedOwner, unsigned length, unsigned& vectorLength)
</del><ins>+inline Butterfly* tryCreateArrayButterfly(VM& vm, JSCell* intendedOwner, unsigned initialLength)
</ins><span class="cx"> {
</span><del>- IndexingHeader header;
- vectorLength = Butterfly::optimalContiguousVectorLength(
- intendedOwner ? intendedOwner->structure(vm) : 0, length);
- header.setVectorLength(vectorLength);
- header.setPublicLength(length);
- Butterfly* result = Butterfly::create(
- vm, intendedOwner, 0, 0, true, header, vectorLength * sizeof(EncodedJSValue));
- return result;
-}
-
-inline Butterfly* createArrayButterfly(VM& vm, JSCell* intendedOwner, unsigned initialLength)
-{
- Butterfly* butterfly = Butterfly::create(
</del><ins>+ Butterfly* butterfly = Butterfly::tryCreate(
</ins><span class="cx"> vm, intendedOwner, 0, 0, true, baseIndexingHeaderForArrayStorage(initialLength),
</span><span class="cx"> ArrayStorage::sizeFor(BASE_ARRAY_STORAGE_VECTOR_LEN));
</span><ins>+ if (!butterfly)
+ return nullptr;
</ins><span class="cx"> ArrayStorage* storage = butterfly->arrayStorage();
</span><span class="cx"> storage->m_sparseMap.clear();
</span><span class="cx"> storage->m_indexBias = 0;
</span><span class="lines">@@ -207,29 +202,50 @@
</span><span class="cx"> return butterfly;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline Butterfly* createArrayButterfly(VM& vm, JSCell* intendedOwner, unsigned initialLength)
+{
+ Butterfly* result = tryCreateArrayButterfly(vm, intendedOwner, initialLength);
+ RELEASE_ASSERT(result);
+ return result;
+}
+
</ins><span class="cx"> Butterfly* createArrayButterflyInDictionaryIndexingMode(
</span><span class="cx"> VM&, JSCell* intendedOwner, unsigned initialLength);
</span><span class="cx">
</span><del>-inline JSArray* JSArray::create(VM& vm, Structure* structure, unsigned initialLength)
</del><ins>+inline JSArray* JSArray::tryCreate(VM& vm, Structure* structure, unsigned initialLength)
</ins><span class="cx"> {
</span><ins>+ unsigned outOfLineStorage = structure->outOfLineCapacity();
+
</ins><span class="cx"> Butterfly* butterfly;
</span><del>- if (LIKELY(!hasAnyArrayStorage(structure->indexingType()))) {
</del><ins>+ IndexingType indexingType = structure->indexingType();
+ if (LIKELY(!hasAnyArrayStorage(indexingType))) {
</ins><span class="cx"> ASSERT(
</span><del>- hasUndecided(structure->indexingType())
- || hasInt32(structure->indexingType())
- || hasDouble(structure->indexingType())
- || hasContiguous(structure->indexingType()));
- unsigned vectorLength;
- butterfly = createContiguousArrayButterfly(vm, 0, initialLength, vectorLength);
- if (hasDouble(structure->indexingType()))
</del><ins>+ hasUndecided(indexingType)
+ || hasInt32(indexingType)
+ || hasDouble(indexingType)
+ || hasContiguous(indexingType));
+
+ if (initialLength > MAX_STORAGE_VECTOR_LENGTH)
+ return 0;
+
+ unsigned vectorLength = Butterfly::optimalContiguousVectorLength(structure, initialLength);
+ void* temp = vm.auxiliarySpace.tryAllocate(nullptr, Butterfly::totalSize(0, outOfLineStorage, true, vectorLength * sizeof(EncodedJSValue)));
+ if (!temp)
+ return nullptr;
+ butterfly = Butterfly::fromBase(temp, 0, outOfLineStorage);
+ butterfly->setVectorLength(vectorLength);
+ butterfly->setPublicLength(initialLength);
+ if (hasDouble(indexingType))
</ins><span class="cx"> clearArray(butterfly->contiguousDouble().data(), vectorLength);
</span><span class="cx"> else
</span><span class="cx"> clearArray(butterfly->contiguous().data(), vectorLength);
</span><span class="cx"> } else {
</span><span class="cx"> ASSERT(
</span><del>- structure->indexingType() == ArrayWithSlowPutArrayStorage
- || structure->indexingType() == ArrayWithArrayStorage);
- butterfly = createArrayButterfly(vm, 0, initialLength);
</del><ins>+ indexingType == ArrayWithSlowPutArrayStorage
+ || indexingType == ArrayWithArrayStorage);
+ butterfly = tryCreateArrayButterfly(vm, 0, initialLength);
+ if (!butterfly)
+ return nullptr;
</ins><span class="cx"> for (unsigned i = 0; i < BASE_ARRAY_STORAGE_VECTOR_LEN; ++i)
</span><span class="cx"> butterfly->arrayStorage()->m_vector[i].clear();
</span><span class="cx"> }
</span><span class="lines">@@ -237,6 +253,14 @@
</span><span class="cx"> return createWithButterfly(vm, nullptr, structure, butterfly);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline JSArray* JSArray::create(VM& vm, Structure* structure, unsigned initialLength)
+{
+ JSArray* result = JSArray::tryCreate(vm, structure, initialLength);
+ RELEASE_ASSERT(result);
+
+ return result;
+}
+
</ins><span class="cx"> inline JSArray* JSArray::createWithButterfly(VM& vm, GCDeferralContext* deferralContext, Structure* structure, Butterfly* butterfly)
</span><span class="cx"> {
</span><span class="cx"> JSArray* array = new (NotNull, allocateCell<JSArray>(vm.heap, deferralContext)) JSArray(vm, structure, butterfly);
</span></span></pre>
</div>
</div>
</body>
</html>