<!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>[202415] 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/202415">202415</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-23 21:39:35 -0700 (Thu, 23 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>OOM Assertion failure in Array.prototype.toString
https://bugs.webkit.org/show_bug.cgi?id=158793
Patch by Benjamin Poulain <bpoulain@apple.com> on 2016-06-23
Reviewed by Saam Barati.
Source/JavaScriptCore:
JSString::create() taking a StringImpl was using a signed integer
for the length of the string.
The problem is StringImpl uses an unsigned integer. When a large string
was passed to JSString, the signed integer would be negative and crash
JSString.
* runtime/JSString.h:
(JSC::JSString::create):
LayoutTests:
* js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js: Added.
(string_appeared_here.createStrings):
* js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js: Added.
(string_appeared_here.createRegexp):
(catch):
* js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js: Added.
(string_appeared_here.createStrings):
(catch):
* js/stringimpl-to-jsstring-on-large-strings-1-expected.txt: Added.
* js/stringimpl-to-jsstring-on-large-strings-1.html: Added.
* js/stringimpl-to-jsstring-on-large-strings-2-expected.txt: Added.
* js/stringimpl-to-jsstring-on-large-strings-2.html: Added.
* js/stringimpl-to-jsstring-on-large-strings-3-expected.txt: Added.
* js/stringimpl-to-jsstring-on-large-strings-3.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSStringh">trunk/Source/JavaScriptCore/runtime/JSString.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsjsscripttestsstringimpltojsstringonlargestrings1js">trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsstringimpltojsstringonlargestrings2js">trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsstringimpltojsstringonlargestrings3js">trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js</a></li>
<li><a href="#trunkLayoutTestsjsstringimpltojsstringonlargestrings1expectedtxt">trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsstringimpltojsstringonlargestrings1html">trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-1.html</a></li>
<li><a href="#trunkLayoutTestsjsstringimpltojsstringonlargestrings2expectedtxt">trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsstringimpltojsstringonlargestrings2html">trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-2.html</a></li>
<li><a href="#trunkLayoutTestsjsstringimpltojsstringonlargestrings3expectedtxt">trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-3-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsstringimpltojsstringonlargestrings3html">trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-3.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202414 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-06-24 04:08:48 UTC (rev 202414)
+++ trunk/LayoutTests/ChangeLog 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-06-23 Benjamin Poulain <bpoulain@apple.com>
+
+ OOM Assertion failure in Array.prototype.toString
+ https://bugs.webkit.org/show_bug.cgi?id=158793
+
+ Reviewed by Saam Barati.
+
+ * js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js: Added.
+ (string_appeared_here.createStrings):
+ * js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js: Added.
+ (string_appeared_here.createRegexp):
+ (catch):
+ * js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js: Added.
+ (string_appeared_here.createStrings):
+ (catch):
+ * js/stringimpl-to-jsstring-on-large-strings-1-expected.txt: Added.
+ * js/stringimpl-to-jsstring-on-large-strings-1.html: Added.
+ * js/stringimpl-to-jsstring-on-large-strings-2-expected.txt: Added.
+ * js/stringimpl-to-jsstring-on-large-strings-2.html: Added.
+ * js/stringimpl-to-jsstring-on-large-strings-3-expected.txt: Added.
+ * js/stringimpl-to-jsstring-on-large-strings-3.html: Added.
+
</ins><span class="cx"> 2016-06-23 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Retrieving Blobs from IndexedDB using cursors fails in WK2 (Sandboxing)
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsstringimpltojsstringonlargestrings1js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js (0 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-1.js 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+"use strict"
+
+// Based on André Bargull's test case.
+// The test pass if it does not crash.
+// see https://bugs.webkit.org/show_bug.cgi?id=158793.
+
+function createStrings() {
+ let p = "a".repeat(0x7ffffff);
+ if (p.length != 0x7ffffff)
+ debug("Failed \"a\".repeat(0x7ffffff)");
+
+ let r = [
+ p, p, p, p, p,
+ p, p, p, p, p,
+ p, p, p, p, p,
+ p, p, p, p, p,
+ p, p, p, p, p
+ ].toString();
+ if (r.length !== 0x7ffffff * 25 + 24)
+ debug("Failed to generate r");
+
+ // This should always overflow with 32bits length.
+ let s = [
+ p, p, p, p, p, p, p, p,
+ p, p, p, p, p, p, p, p,
+ p, p, p, p, p, p, p, p,
+ p, p, p, p, p, p, p, p,
+ ].toString();
+ if (s.length !== 0x7ffffff * 32 + 31)
+ debug("Failed to generate s");
+
+ return [p, r, s];
+}
+shouldThrow("createStrings()", '"Error: Out of memory"');
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsstringimpltojsstringonlargestrings2js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js (0 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-2.js 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+"use strict"
+
+// Based on André Bargull's test case.
+// The test pass if it does not crash.
+// see https://bugs.webkit.org/show_bug.cgi?id=158793.
+
+function createRegexp() {
+ var s = "a".repeat(0x3fffffff);
+ var r = RegExp.prototype.toString.call({
+ source: s,
+ flags: s,
+ });
+ return [s, r];
+}
+try {
+ createRegexp();
+} catch (e) { }
+debug("PASS: no crash");
</ins></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsstringimpltojsstringonlargestrings3js"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js (0 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js (rev 0)
+++ trunk/LayoutTests/js/script-tests/stringimpl-to-jsstring-on-large-strings-3.js 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+"use strict"
+
+// This test passes if it does not crash.
+function createStrings() {
+ let a = "a".repeat(0x7fffffff);
+ if (a.length !== 0x7fffffff)
+ debug("Failed to create a string of length 0x7ffffffff");
+
+ a = "a".repeat(0x80000000);
+ if (a.length !== 0x80000000)
+ debug("Failed to create a string of length 0x80000000");
+
+ a = "a".repeat(0x7fffffff - 2);
+ if (a.length != 0x7fffffff - 2)
+ debug("Failed to create a string of length 0x7fffffff - 2");
+
+ let b = [a, 'b'];
+ let c = b.toString();
+ if (b.length !== 0x7ffffffff)
+ debug("Failed to join a string of length 0x7ffffffff");
+
+ a = "a".repeat(0x7fffffff - 1);
+ if (a.length != 0x7fffffff - 1)
+ debug("Failed to create a string of length 0x7fffffff - 1");
+
+ b = [a, 'b'];
+ c = b.toString();
+ if (b.length !== 0x80000000)
+ debug("Failed to join a string of length 0x80000000");
+ return [a, b, c];
+}
+try {
+ createStrings();
+} catch (e) { }
+
+debug("PASS: the test did not crash")
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsstringimpltojsstringonlargestrings1expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-1-expected.txt (0 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-1-expected.txt (rev 0)
+++ trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-1-expected.txt 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+PASS createStrings() threw exception Error: Out of memory.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsstringimpltojsstringonlargestrings1html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-1.html (0 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-1.html (rev 0)
+++ trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-1.html 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/stringimpl-to-jsstring-on-large-strings-1.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsstringimpltojsstringonlargestrings2expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-2-expected.txt (0 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-2-expected.txt (rev 0)
+++ trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-2-expected.txt 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+PASS: no crash
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsstringimpltojsstringonlargestrings2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-2.html (0 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-2.html (rev 0)
+++ trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-2.html 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/stringimpl-to-jsstring-on-large-strings-2.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsjsstringimpltojsstringonlargestrings3expectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-3-expected.txt (0 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-3-expected.txt (rev 0)
+++ trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-3-expected.txt 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+PASS: the test did not crash
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsjsstringimpltojsstringonlargestrings3html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-3.html (0 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-3.html (rev 0)
+++ trunk/LayoutTests/js/stringimpl-to-jsstring-on-large-strings-3.html 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/stringimpl-to-jsstring-on-large-strings-3.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202414 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-24 04:08:48 UTC (rev 202414)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-06-23 Benjamin Poulain <bpoulain@apple.com>
+
+ OOM Assertion failure in Array.prototype.toString
+ https://bugs.webkit.org/show_bug.cgi?id=158793
+
+ Reviewed by Saam Barati.
+
+ JSString::create() taking a StringImpl was using a signed integer
+ for the length of the string.
+ The problem is StringImpl uses an unsigned integer. When a large string
+ was passed to JSString, the signed integer would be negative and crash
+ JSString.
+
+ * runtime/JSString.h:
+ (JSC::JSString::create):
+
</ins><span class="cx"> 2016-06-23 Joseph Pecoraro <pecoraro@apple.com> and Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Implement isFinite / isNaN in JS and make DFG ToNumber accept non number values
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSString.h (202414 => 202415)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSString.h 2016-06-24 04:08:48 UTC (rev 202414)
+++ trunk/Source/JavaScriptCore/runtime/JSString.h 2016-06-24 04:39:35 UTC (rev 202415)
</span><span class="lines">@@ -132,8 +132,7 @@
</span><span class="cx"> static JSString* create(VM& vm, PassRefPtr<StringImpl> value)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(value);
</span><del>- int32_t length = value->length();
- RELEASE_ASSERT(length >= 0);
</del><ins>+ unsigned length = value->length();
</ins><span class="cx"> size_t cost = value->cost();
</span><span class="cx"> JSString* newString = new (NotNull, allocateCell<JSString>(vm.heap)) JSString(vm, value);
</span><span class="cx"> newString->finishCreation(vm, length, cost);
</span></span></pre>
</div>
</div>
</body>
</html>