<!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>[214079] 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/214079">214079</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2017-03-16 16:51:19 -0700 (Thu, 16 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Array concat operation should check for length overflows.
https://bugs.webkit.org/show_bug.cgi?id=169796
<rdar://problem/31095276>
Reviewed by Keith Miller.
* runtime/ArrayPrototype.cpp:
(JSC::concatAppendOne):
(JSC::arrayProtoPrivateFuncConcatMemcpy):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeArrayPrototypecpp">trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214078 => 214079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-16 23:30:09 UTC (rev 214078)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-16 23:51:19 UTC (rev 214079)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2017-03-16 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Array concat operation should check for length overflows.
+ https://bugs.webkit.org/show_bug.cgi?id=169796
+ <rdar://problem/31095276>
+
+ Reviewed by Keith Miller.
+
+ * runtime/ArrayPrototype.cpp:
+ (JSC::concatAppendOne):
+ (JSC::arrayProtoPrivateFuncConcatMemcpy):
+
+2017-03-16 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> The new array with spread operation needs to check for length overflows.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169780
</span><span class="cx"> <rdar://problem/31072182>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeArrayPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp (214078 => 214079)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2017-03-16 23:30:09 UTC (rev 214078)
+++ trunk/Source/JavaScriptCore/runtime/ArrayPrototype.cpp 2017-03-16 23:51:19 UTC (rev 214079)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> /*
</span><span class="cx"> * Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
</span><del>- * Copyright (C) 2003, 2007-2009, 2011, 2013, 2015-2017 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2003-2017 Apple Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2003 Peter Kelly (pmk@post.com)
</span><span class="cx"> * Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
</span><span class="cx"> *
</span><span class="lines">@@ -1205,6 +1205,14 @@
</span><span class="cx"> Butterfly* firstButterfly = first->butterfly();
</span><span class="cx"> unsigned firstArraySize = firstButterfly->publicLength();
</span><span class="cx">
</span><ins>+ Checked<unsigned, RecordOverflow> checkedResultSize = firstArraySize;
+ checkedResultSize += 1;
+ if (UNLIKELY(checkedResultSize.hasOverflowed())) {
+ throwOutOfMemoryError(exec, scope);
+ return encodedJSValue();
+ }
+
+ unsigned resultSize = checkedResultSize.unsafeGet();
</ins><span class="cx"> IndexingType type = first->mergeIndexingTypeForCopying(indexingTypeForValue(second) | IsArray);
</span><span class="cx">
</span><span class="cx"> if (type == NonArray)
</span><span class="lines">@@ -1211,9 +1219,11 @@
</span><span class="cx"> type = first->indexingType();
</span><span class="cx">
</span><span class="cx"> Structure* resultStructure = exec->lexicalGlobalObject()->arrayStructureForIndexingTypeDuringAllocation(type);
</span><del>- JSArray* result = JSArray::create(vm, resultStructure, firstArraySize + 1);
- if (!result)
- return JSValue::encode(throwOutOfMemoryError(exec, scope));
</del><ins>+ JSArray* result = JSArray::create(vm, resultStructure, resultSize);
+ if (UNLIKELY(!result)) {
+ throwOutOfMemoryError(exec, scope);
+ return encodedJSValue();
+ }
</ins><span class="cx">
</span><span class="cx"> bool success = result->appendMemcpy(exec, vm, 0, first);
</span><span class="cx"> ASSERT(!success || !scope.exception());
</span><span class="lines">@@ -1266,10 +1276,19 @@
</span><span class="cx"> unsigned firstArraySize = firstButterfly->publicLength();
</span><span class="cx"> unsigned secondArraySize = secondButterfly->publicLength();
</span><span class="cx">
</span><ins>+ Checked<unsigned, RecordOverflow> checkedResultSize = firstArraySize;
+ checkedResultSize += secondArraySize;
+
+ if (UNLIKELY(checkedResultSize.hasOverflowed())) {
+ throwOutOfMemoryError(exec, scope);
+ return encodedJSValue();
+ }
+
+ unsigned resultSize = checkedResultSize.unsafeGet();
</ins><span class="cx"> IndexingType secondType = secondArray->indexingType();
</span><span class="cx"> IndexingType type = firstArray->mergeIndexingTypeForCopying(secondType);
</span><del>- if (type == NonArray || !firstArray->canFastCopy(vm, secondArray) || firstArraySize + secondArraySize >= MIN_SPARSE_ARRAY_INDEX) {
- JSArray* result = constructEmptyArray(exec, nullptr, firstArraySize + secondArraySize);
</del><ins>+ if (type == NonArray || !firstArray->canFastCopy(vm, secondArray) || resultSize >= MIN_SPARSE_ARRAY_INDEX) {
+ JSArray* result = constructEmptyArray(exec, nullptr, resultSize);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx">
</span><span class="cx"> bool success = moveElements(exec, vm, result, 0, firstArray, firstArraySize);
</span><span class="lines">@@ -1285,9 +1304,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Structure* resultStructure = exec->lexicalGlobalObject()->arrayStructureForIndexingTypeDuringAllocation(type);
</span><del>- JSArray* result = JSArray::tryCreateForInitializationPrivate(vm, resultStructure, firstArraySize + secondArraySize);
- if (!result)
- return JSValue::encode(throwOutOfMemoryError(exec, scope));
</del><ins>+ JSArray* result = JSArray::tryCreateForInitializationPrivate(vm, resultStructure, resultSize);
+ if (UNLIKELY(!result)) {
+ throwOutOfMemoryError(exec, scope);
+ return encodedJSValue();
+ }
</ins><span class="cx">
</span><span class="cx"> if (type == ArrayWithDouble) {
</span><span class="cx"> double* buffer = result->butterfly()->contiguousDouble().data();
</span><span class="lines">@@ -1304,7 +1325,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- result->butterfly()->setPublicLength(firstArraySize + secondArraySize);
</del><ins>+ result->butterfly()->setPublicLength(resultSize);
</ins><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>