<!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>[207849] trunk</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/207849">207849</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-10-25 15:19:37 -0700 (Tue, 25 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>JSStringJoiner::joinedLength() should limit joined string lengths to INT_MAX.
https://bugs.webkit.org/show_bug.cgi?id=163937
<rdar://problem/28642990>
Reviewed by Geoffrey Garen.
JSTests:
* stress/joined-strings-should-not-exceed-max-string-length.js: Added.
Source/JavaScriptCore:
JSStringJoiner::joinedLength() was previously limiting it to UINT_MAX. This is
inconsistent with other parts of string code which expects a max length of INT_MAX.
This is now fixed.
Also fixed jsMakeNontrivialString() to ensure that the resultant string length
is valid. It was previously allowing lengths greater than INT_MAX. This was
caught by the new assertion in JSString::setLength().
There are already pre-existing assertions in various JSString::finishCreation()
which do RELEASE_ASSERTs on the string length. To be consistent, I'm making the
assertion in JSString::setLength() a RELEASE_ASSERT. If this proves to be a
performance issue, I'll change this to a debug ASSERT later.
* runtime/JSString.cpp:
(JSC::JSRopeString::resolveRopeInternal8):
(JSC::JSRopeString::resolveRopeInternal8NoSubstring):
(JSC::JSRopeString::resolveRopeInternal16):
(JSC::JSRopeString::resolveRopeInternal16NoSubstring):
(JSC::JSRopeString::resolveRopeToAtomicString):
(JSC::JSRopeString::resolveRopeToExistingAtomicString):
(JSC::JSRopeString::resolveRope):
(JSC::JSRopeString::resolveRopeSlowCase8):
(JSC::JSRopeString::resolveRopeSlowCase):
(JSC::JSString::getStringPropertyDescriptor):
* runtime/JSString.h:
(JSC::JSString::finishCreation):
(JSC::JSString::length):
(JSC::JSString::isValidLength):
(JSC::JSString::toBoolean):
(JSC::JSString::canGetIndex):
(JSC::JSString::setLength):
(JSC::JSString::getStringPropertySlot):
(JSC::JSRopeString::unsafeView):
(JSC::JSRopeString::viewWithUnderlyingString):
* runtime/JSStringBuilder.h:
(JSC::jsMakeNontrivialString):
* runtime/JSStringJoiner.cpp:
(JSC::JSStringJoiner::joinedLength):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringcpp">trunk/Source/JavaScriptCore/runtime/JSString.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringh">trunk/Source/JavaScriptCore/runtime/JSString.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringBuilderh">trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringJoinercpp">trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressjoinedstringsshouldnotexceedmaxstringlengthjs">trunk/JSTests/stress/joined-strings-should-not-exceed-max-string-length.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (207848 => 207849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-10-25 22:07:20 UTC (rev 207848)
+++ trunk/JSTests/ChangeLog 2016-10-25 22:19:37 UTC (rev 207849)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-10-25 Mark Lam <mark.lam@apple.com>
+
+ JSStringJoiner::joinedLength() should limit joined string lengths to INT_MAX.
+ https://bugs.webkit.org/show_bug.cgi?id=163937
+ <rdar://problem/28642990>
+
+ Reviewed by Geoffrey Garen.
+
+ * stress/joined-strings-should-not-exceed-max-string-length.js: Added.
+
</ins><span class="cx"> 2016-10-25 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly JS API: simple Module test
</span></span></pre></div>
<a id="trunkJSTestsstressjoinedstringsshouldnotexceedmaxstringlengthjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/joined-strings-should-not-exceed-max-string-length.js (0 => 207849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/joined-strings-should-not-exceed-max-string-length.js (rev 0)
+++ trunk/JSTests/stress/joined-strings-should-not-exceed-max-string-length.js 2016-10-25 22:19:37 UTC (rev 207849)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+//@ runFTLNoCJIT
+//@ largeHeap
+// This test should not crash or fail any assertions.
+
+function shouldEqual(stepId, actual, expected) {
+ if (actual != expected) {
+ throw stepId + ": ERROR: expect " + expected + ", actual " + actual;
+ }
+}
+
+var exception = undefined;
+
+arr = [null,null,null,null];
+str = "xx";
+
+try {
+ for (var i = 0; i < 100; ++i)
+ str = arr.join(str);
+} catch (e) {
+ exception = e;
+}
+shouldEqual(10000, exception, "Error: Out of memory");
+
+exception = undefined;
+try {
+ str += 'x';
+} catch(e) {
+ exception = e;
+}
+shouldEqual(10100, exception, undefined);
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207848 => 207849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-25 22:07:20 UTC (rev 207848)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-25 22:19:37 UTC (rev 207849)
</span><span class="lines">@@ -1,3 +1,50 @@
</span><ins>+2016-10-25 Mark Lam <mark.lam@apple.com>
+
+ JSStringJoiner::joinedLength() should limit joined string lengths to INT_MAX.
+ https://bugs.webkit.org/show_bug.cgi?id=163937
+ <rdar://problem/28642990>
+
+ Reviewed by Geoffrey Garen.
+
+ JSStringJoiner::joinedLength() was previously limiting it to UINT_MAX. This is
+ inconsistent with other parts of string code which expects a max length of INT_MAX.
+ This is now fixed.
+
+ Also fixed jsMakeNontrivialString() to ensure that the resultant string length
+ is valid. It was previously allowing lengths greater than INT_MAX. This was
+ caught by the new assertion in JSString::setLength().
+
+ There are already pre-existing assertions in various JSString::finishCreation()
+ which do RELEASE_ASSERTs on the string length. To be consistent, I'm making the
+ assertion in JSString::setLength() a RELEASE_ASSERT. If this proves to be a
+ performance issue, I'll change this to a debug ASSERT later.
+
+ * runtime/JSString.cpp:
+ (JSC::JSRopeString::resolveRopeInternal8):
+ (JSC::JSRopeString::resolveRopeInternal8NoSubstring):
+ (JSC::JSRopeString::resolveRopeInternal16):
+ (JSC::JSRopeString::resolveRopeInternal16NoSubstring):
+ (JSC::JSRopeString::resolveRopeToAtomicString):
+ (JSC::JSRopeString::resolveRopeToExistingAtomicString):
+ (JSC::JSRopeString::resolveRope):
+ (JSC::JSRopeString::resolveRopeSlowCase8):
+ (JSC::JSRopeString::resolveRopeSlowCase):
+ (JSC::JSString::getStringPropertyDescriptor):
+ * runtime/JSString.h:
+ (JSC::JSString::finishCreation):
+ (JSC::JSString::length):
+ (JSC::JSString::isValidLength):
+ (JSC::JSString::toBoolean):
+ (JSC::JSString::canGetIndex):
+ (JSC::JSString::setLength):
+ (JSC::JSString::getStringPropertySlot):
+ (JSC::JSRopeString::unsafeView):
+ (JSC::JSRopeString::viewWithUnderlyingString):
+ * runtime/JSStringBuilder.h:
+ (JSC::jsMakeNontrivialString):
+ * runtime/JSStringJoiner.cpp:
+ (JSC::JSStringJoiner::joinedLength):
+
</ins><span class="cx"> 2016-10-25 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><span class="cx"> WebAssembly: fix unknown section name handling, and check for section size overflow
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.cpp (207848 => 207849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.cpp 2016-10-25 22:07:20 UTC (rev 207848)
+++ trunk/Source/JavaScriptCore/runtime/JSString.cpp 2016-10-25 22:19:37 UTC (rev 207849)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isSubstring()) {
</span><span class="cx"> StringImpl::copyChars(
</span><del>- buffer, substringBase()->m_value.characters8() + substringOffset(), m_length);
</del><ins>+ buffer, substringBase()->m_value.characters8() + substringOffset(), length());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> StringImpl::copyChars(position, fiberString.characters8(), length);
</span><span class="cx"> position += length;
</span><span class="cx"> }
</span><del>- ASSERT((buffer + m_length) == position);
</del><ins>+ ASSERT((buffer + length()) == position);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSRopeString::resolveRopeInternal16(UChar* buffer) const
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (isSubstring()) {
</span><span class="cx"> StringImpl::copyChars(
</span><del>- buffer, substringBase()->m_value.characters16() + substringOffset(), m_length);
</del><ins>+ buffer, substringBase()->m_value.characters16() + substringOffset(), length());
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -176,12 +176,12 @@
</span><span class="cx"> StringImpl::copyChars(position, fiberString.characters16(), length);
</span><span class="cx"> position += length;
</span><span class="cx"> }
</span><del>- ASSERT((buffer + m_length) == position);
</del><ins>+ ASSERT((buffer + length()) == position);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSRopeString::resolveRopeToAtomicString(ExecState* exec) const
</span><span class="cx"> {
</span><del>- if (m_length > maxLengthForOnStackResolve) {
</del><ins>+ if (length() > maxLengthForOnStackResolve) {
</ins><span class="cx"> resolveRope(exec);
</span><span class="cx"> m_value = AtomicString(m_value);
</span><span class="cx"> setIs8Bit(m_value.impl()->is8Bit());
</span><span class="lines">@@ -191,12 +191,12 @@
</span><span class="cx"> if (is8Bit()) {
</span><span class="cx"> LChar buffer[maxLengthForOnStackResolve];
</span><span class="cx"> resolveRopeInternal8(buffer);
</span><del>- m_value = AtomicString(buffer, m_length);
</del><ins>+ m_value = AtomicString(buffer, length());
</ins><span class="cx"> setIs8Bit(m_value.impl()->is8Bit());
</span><span class="cx"> } else {
</span><span class="cx"> UChar buffer[maxLengthForOnStackResolve];
</span><span class="cx"> resolveRopeInternal16(buffer);
</span><del>- m_value = AtomicString(buffer, m_length);
</del><ins>+ m_value = AtomicString(buffer, length());
</ins><span class="cx"> setIs8Bit(m_value.impl()->is8Bit());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<AtomicStringImpl> JSRopeString::resolveRopeToExistingAtomicString(ExecState* exec) const
</span><span class="cx"> {
</span><del>- if (m_length > maxLengthForOnStackResolve) {
</del><ins>+ if (length() > maxLengthForOnStackResolve) {
</ins><span class="cx"> resolveRope(exec);
</span><span class="cx"> if (RefPtr<AtomicStringImpl> existingAtomicString = AtomicStringImpl::lookUp(m_value.impl())) {
</span><span class="cx"> m_value = *existingAtomicString;
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> if (is8Bit()) {
</span><span class="cx"> LChar buffer[maxLengthForOnStackResolve];
</span><span class="cx"> resolveRopeInternal8(buffer);
</span><del>- if (RefPtr<AtomicStringImpl> existingAtomicString = AtomicStringImpl::lookUp(buffer, m_length)) {
</del><ins>+ if (RefPtr<AtomicStringImpl> existingAtomicString = AtomicStringImpl::lookUp(buffer, length())) {
</ins><span class="cx"> m_value = *existingAtomicString;
</span><span class="cx"> setIs8Bit(m_value.impl()->is8Bit());
</span><span class="cx"> clearFibers();
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> UChar buffer[maxLengthForOnStackResolve];
</span><span class="cx"> resolveRopeInternal16(buffer);
</span><del>- if (RefPtr<AtomicStringImpl> existingAtomicString = AtomicStringImpl::lookUp(buffer, m_length)) {
</del><ins>+ if (RefPtr<AtomicStringImpl> existingAtomicString = AtomicStringImpl::lookUp(buffer, length())) {
</ins><span class="cx"> m_value = *existingAtomicString;
</span><span class="cx"> setIs8Bit(m_value.impl()->is8Bit());
</span><span class="cx"> clearFibers();
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx">
</span><span class="cx"> if (isSubstring()) {
</span><span class="cx"> ASSERT(!substringBase()->isRope());
</span><del>- m_value = substringBase()->m_value.substringSharingImpl(substringOffset(), m_length);
</del><ins>+ m_value = substringBase()->m_value.substringSharingImpl(substringOffset(), length());
</ins><span class="cx"> substringBase().clear();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx">
</span><span class="cx"> if (is8Bit()) {
</span><span class="cx"> LChar* buffer;
</span><del>- if (auto newImpl = StringImpl::tryCreateUninitialized(m_length, buffer)) {
</del><ins>+ if (auto newImpl = StringImpl::tryCreateUninitialized(length(), buffer)) {
</ins><span class="cx"> Heap::heap(this)->reportExtraMemoryAllocated(newImpl->cost());
</span><span class="cx"> m_value = WTFMove(newImpl);
</span><span class="cx"> } else {
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UChar* buffer;
</span><del>- if (auto newImpl = StringImpl::tryCreateUninitialized(m_length, buffer)) {
</del><ins>+ if (auto newImpl = StringImpl::tryCreateUninitialized(length(), buffer)) {
</ins><span class="cx"> Heap::heap(this)->reportExtraMemoryAllocated(newImpl->cost());
</span><span class="cx"> m_value = WTFMove(newImpl);
</span><span class="cx"> } else {
</span><span class="lines">@@ -301,7 +301,7 @@
</span><span class="cx"> // rope-of-ropes.)
</span><span class="cx"> void JSRopeString::resolveRopeSlowCase8(LChar* buffer) const
</span><span class="cx"> {
</span><del>- LChar* position = buffer + m_length; // We will be working backwards over the rope.
</del><ins>+ LChar* position = buffer + length(); // We will be working backwards over the rope.
</ins><span class="cx"> Vector<JSString*, 32, UnsafeVectorOverflow> workQueue; // Putting strings into a Vector is only OK because there are no GC points in this method.
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < s_maxInternalRopeLength && fiber(i); ++i)
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx">
</span><span class="cx"> void JSRopeString::resolveRopeSlowCase(UChar* buffer) const
</span><span class="cx"> {
</span><del>- UChar* position = buffer + m_length; // We will be working backwards over the rope.
</del><ins>+ UChar* position = buffer + length(); // We will be working backwards over the rope.
</ins><span class="cx"> Vector<JSString*, 32, UnsafeVectorOverflow> workQueue; // These strings are kept alive by the parent rope, so using a Vector is OK.
</span><span class="cx">
</span><span class="cx"> for (size_t i = 0; i < s_maxInternalRopeLength && fiber(i); ++i)
</span><span class="lines">@@ -430,12 +430,12 @@
</span><span class="cx"> bool JSString::getStringPropertyDescriptor(ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
</span><span class="cx"> {
</span><span class="cx"> if (propertyName == exec->propertyNames().length) {
</span><del>- descriptor.setDescriptor(jsNumber(m_length), DontEnum | DontDelete | ReadOnly);
</del><ins>+ descriptor.setDescriptor(jsNumber(length()), DontEnum | DontDelete | ReadOnly);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Optional<uint32_t> index = parseIndex(propertyName);
</span><del>- if (index && index.value() < m_length) {
</del><ins>+ if (index && index.value() < length()) {
</ins><span class="cx"> descriptor.setDescriptor(getIndex(exec, index.value()), DontDelete | ReadOnly);
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.h (207848 => 207849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.h 2016-10-25 22:07:20 UTC (rev 207848)
+++ trunk/Source/JavaScriptCore/runtime/JSString.h 2016-10-25 22:19:37 UTC (rev 207849)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_value.isNull());
</span><span class="cx"> Base::finishCreation(vm);
</span><del>- m_length = length;
</del><ins>+ setLength(length);
</ins><span class="cx"> setIs8Bit(m_value.impl()->is8Bit());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_value.isNull());
</span><span class="cx"> Base::finishCreation(vm);
</span><del>- m_length = length;
</del><ins>+ setLength(length);
</ins><span class="cx"> setIs8Bit(m_value.impl()->is8Bit());
</span><span class="cx"> Heap::heap(this)->reportExtraMemoryAllocated(cost);
</span><span class="cx"> }
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> void finishCreation(VM& vm)
</span><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><del>- m_length = 0;
</del><ins>+ setLength(0);
</ins><span class="cx"> setIs8Bit(true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -158,10 +158,18 @@
</span><span class="cx"> const String& value(ExecState*) const;
</span><span class="cx"> const String& tryGetValue() const;
</span><span class="cx"> const StringImpl* tryGetValueImpl() const;
</span><del>- unsigned length() const { return m_length; }
</del><ins>+ ALWAYS_INLINE unsigned length() const { return m_length; }
+ ALWAYS_INLINE static bool isValidLength(size_t length)
+ {
+ // While length is of type unsigned, the runtime and compilers are all
+ // expecting that m_length is a positive value <= INT_MAX.
+ // FIXME: Look into making the max length UINT_MAX to match StringImpl's max length.
+ // https://bugs.webkit.org/show_bug.cgi?id=163955
+ return length <= std::numeric_limits<int32_t>::max();
+ }
</ins><span class="cx">
</span><span class="cx"> JSValue toPrimitive(ExecState*, PreferredPrimitiveType) const;
</span><del>- bool toBoolean() const { return !!m_length; }
</del><ins>+ bool toBoolean() const { return !!length(); }
</ins><span class="cx"> bool getPrimitiveNumber(ExecState*, double& number, JSValue&) const;
</span><span class="cx"> JSObject* toObject(ExecState*, JSGlobalObject*) const;
</span><span class="cx"> double toNumber(ExecState*) const;
</span><span class="lines">@@ -170,7 +178,7 @@
</span><span class="cx"> bool getStringPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
</span><span class="cx"> bool getStringPropertyDescriptor(ExecState*, PropertyName, PropertyDescriptor&);
</span><span class="cx">
</span><del>- bool canGetIndex(unsigned i) { return i < m_length; }
</del><ins>+ bool canGetIndex(unsigned i) { return i < length(); }
</ins><span class="cx"> JSString* getIndex(ExecState*, unsigned);
</span><span class="cx">
</span><span class="cx"> static Structure* createStructure(VM&, JSGlobalObject*, JSValue);
</span><span class="lines">@@ -204,6 +212,13 @@
</span><span class="cx"> m_flags &= ~Is8Bit;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ALWAYS_INLINE void setLength(unsigned length)
+ {
+ RELEASE_ASSERT(isValidLength(length));
+ m_length = length;
+ }
+
+private:
</ins><span class="cx"> mutable unsigned m_flags;
</span><span class="cx">
</span><span class="cx"> // A string is represented either by a String or a rope of fibers.
</span><span class="lines">@@ -210,7 +225,6 @@
</span><span class="cx"> unsigned m_length;
</span><span class="cx"> mutable String m_value;
</span><span class="cx">
</span><del>-private:
</del><span class="cx"> friend class LLIntOffsetsExtractor;
</span><span class="cx">
</span><span class="cx"> static JSValue toThis(JSCell*, ExecState*, ECMAMode);
</span><span class="lines">@@ -257,7 +271,7 @@
</span><span class="cx"> return tmp;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- unsigned length() const { return m_jsString->m_length; }
</del><ins>+ unsigned length() const { return m_jsString->length(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void expand();
</span><span class="lines">@@ -277,7 +291,7 @@
</span><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> ASSERT(!sumOverflows<int32_t>(s1->length(), s2->length()));
</span><del>- m_length = s1->length() + s2->length();
</del><ins>+ setLength(s1->length() + s2->length());
</ins><span class="cx"> setIs8Bit(s1->is8Bit() && s2->is8Bit());
</span><span class="cx"> setIsSubstring(false);
</span><span class="cx"> fiber(0).set(vm, this, s1);
</span><span class="lines">@@ -289,7 +303,7 @@
</span><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> ASSERT(!sumOverflows<int32_t>(s1->length(), s2->length(), s3->length()));
</span><del>- m_length = s1->length() + s2->length() + s3->length();
</del><ins>+ setLength(s1->length() + s2->length() + s3->length());
</ins><span class="cx"> setIs8Bit(s1->is8Bit() && s2->is8Bit() && s3->is8Bit());
</span><span class="cx"> setIsSubstring(false);
</span><span class="cx"> fiber(0).set(vm, this, s1);
</span><span class="lines">@@ -302,7 +316,7 @@
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> RELEASE_ASSERT(!sumOverflows<int32_t>(offset, length));
</span><span class="cx"> RELEASE_ASSERT(offset + length <= base->length());
</span><del>- m_length = length;
</del><ins>+ setLength(length);
</ins><span class="cx"> setIs8Bit(base->is8Bit());
</span><span class="cx"> setIsSubstring(true);
</span><span class="cx"> if (base->isSubstring()) {
</span><span class="lines">@@ -326,7 +340,7 @@
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx"> RELEASE_ASSERT(!sumOverflows<int32_t>(offset, length));
</span><span class="cx"> RELEASE_ASSERT(offset + length <= base->length());
</span><del>- m_length = length;
</del><ins>+ setLength(length);
</ins><span class="cx"> setIs8Bit(base->is8Bit());
</span><span class="cx"> setIsSubstring(true);
</span><span class="cx"> substringBase().set(vm, this, base);
</span><span class="lines">@@ -345,8 +359,7 @@
</span><span class="cx"> void append(VM& vm, size_t index, JSString* jsString)
</span><span class="cx"> {
</span><span class="cx"> fiber(index).set(vm, this, jsString);
</span><del>- m_length += jsString->m_length;
- RELEASE_ASSERT(static_cast<int32_t>(m_length) >= 0);
</del><ins>+ setLength(length() + jsString->length());
</ins><span class="cx"> setIs8Bit(is8Bit() && jsString->is8Bit());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -674,12 +687,12 @@
</span><span class="cx"> ALWAYS_INLINE bool JSString::getStringPropertySlot(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span><span class="cx"> {
</span><span class="cx"> if (propertyName == exec->propertyNames().length) {
</span><del>- slot.setValue(this, DontEnum | DontDelete | ReadOnly, jsNumber(m_length));
</del><ins>+ slot.setValue(this, DontEnum | DontDelete | ReadOnly, jsNumber(length()));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Optional<uint32_t> index = parseIndex(propertyName);
</span><del>- if (index && index.value() < m_length) {
</del><ins>+ if (index && index.value() < length()) {
</ins><span class="cx"> slot.setValue(this, DontDelete | ReadOnly, getIndex(exec, index.value()));
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -689,7 +702,7 @@
</span><span class="cx">
</span><span class="cx"> ALWAYS_INLINE bool JSString::getStringPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot)
</span><span class="cx"> {
</span><del>- if (propertyName < m_length) {
</del><ins>+ if (propertyName < length()) {
</ins><span class="cx"> slot.setValue(this, DontDelete | ReadOnly, getIndex(exec, propertyName));
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -711,8 +724,8 @@
</span><span class="cx"> {
</span><span class="cx"> if (isSubstring()) {
</span><span class="cx"> if (is8Bit())
</span><del>- return StringView(substringBase()->m_value.characters8() + substringOffset(), m_length);
- return StringView(substringBase()->m_value.characters16() + substringOffset(), m_length);
</del><ins>+ return StringView(substringBase()->m_value.characters8() + substringOffset(), length());
+ return StringView(substringBase()->m_value.characters16() + substringOffset(), length());
</ins><span class="cx"> }
</span><span class="cx"> resolveRope(&state);
</span><span class="cx"> return m_value;
</span><span class="lines">@@ -723,8 +736,8 @@
</span><span class="cx"> if (isSubstring()) {
</span><span class="cx"> auto& base = substringBase()->m_value;
</span><span class="cx"> if (is8Bit())
</span><del>- return { { base.characters8() + substringOffset(), m_length }, base };
- return { { base.characters16() + substringOffset(), m_length }, base };
</del><ins>+ return { { base.characters8() + substringOffset(), length() }, base };
+ return { { base.characters16() + substringOffset(), length() }, base };
</ins><span class="cx"> }
</span><span class="cx"> resolveRope(&state);
</span><span class="cx"> return { m_value, m_value };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h (207848 => 207849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h 2016-10-25 22:07:20 UTC (rev 207848)
+++ trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h 2016-10-25 22:19:37 UTC (rev 207849)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx"> String result = WTF::tryMakeString(string, strings...);
</span><del>- if (!result)
</del><ins>+ if (UNLIKELY(!result || !JSString::isValidLength(result.length())))
</ins><span class="cx"> return throwOutOfMemoryError(exec, scope);
</span><span class="cx"> return jsNontrivialString(exec, WTFMove(result));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringJoinercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp (207848 => 207849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp 2016-10-25 22:07:20 UTC (rev 207848)
+++ trunk/Source/JavaScriptCore/runtime/JSStringJoiner.cpp 2016-10-25 22:19:37 UTC (rev 207849)
</span><span class="lines">@@ -88,11 +88,11 @@
</span><span class="cx"> if (!numberOfStrings)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- Checked<unsigned, RecordOverflow> separatorLength = m_separator.length();
- Checked<unsigned, RecordOverflow> totalSeparatorsLength = separatorLength * (numberOfStrings - 1);
- Checked<unsigned, RecordOverflow> totalLength = totalSeparatorsLength + m_accumulatedStringsLength;
</del><ins>+ Checked<int32_t, RecordOverflow> separatorLength = m_separator.length();
+ Checked<int32_t, RecordOverflow> totalSeparatorsLength = separatorLength * (numberOfStrings - 1);
+ Checked<int32_t, RecordOverflow> totalLength = totalSeparatorsLength + m_accumulatedStringsLength;
</ins><span class="cx">
</span><del>- unsigned result;
</del><ins>+ int32_t result;
</ins><span class="cx"> if (totalLength.safeGet(result) == CheckedState::DidOverflow) {
</span><span class="cx"> throwOutOfMemoryError(&state, scope);
</span><span class="cx"> return 0;
</span></span></pre>
</div>
</div>
</body>
</html>