<!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>[203891] branches/safari-602-branch/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/203891">203891</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-07-29 00:12:56 -0700 (Fri, 29 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/203790">r203790</a>. rdar://problem/27328525</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceJavaScriptCoreChangeLog">branches/safari-602-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreinterpreterInterpretercpp">branches/safari-602-branch/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceJavaScriptCoretestsstressapplysecondargumentmustbearraylikejs">branches/safari-602-branch/Source/JavaScriptCore/tests/stress/apply-second-argument-must-be-array-like.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/ChangeLog (203890 => 203891)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-07-29 07:12:53 UTC (rev 203890)
+++ branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-07-29 07:12:56 UTC (rev 203891)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-07-28 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r203790. rdar://problem/27328525
+
+ 2016-07-27 Mark Lam <mark.lam@apple.com>
+
+ The second argument for Function.prototype.apply should be array-like or null/undefined.
+ https://bugs.webkit.org/show_bug.cgi?id=160212
+ <rdar://problem/27328525>
+
+ Reviewed by Filip Pizlo.
+
+ The spec for Function.prototype.apply says its second argument can only be null,
+ undefined, or must be array-like. See
+ https://tc39.github.io/ecma262/#sec-function.prototype.apply and
+ https://tc39.github.io/ecma262/#sec-createlistfromarraylike.
+
+ Our previous implementation was not handling this correctly for SymbolType.
+ This is now fixed.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::sizeOfVarargs):
+ * tests/stress/apply-second-argument-must-be-array-like.js: Added.
+
</ins><span class="cx"> 2016-07-22 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r203488. rdar://problem/27439330
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/interpreter/Interpreter.cpp (203890 => 203891)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-07-29 07:12:53 UTC (rev 203890)
+++ branches/safari-602-branch/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-07-29 07:12:56 UTC (rev 203891)
</span><span class="lines">@@ -215,10 +215,12 @@
</span><span class="cx"> length = jsCast<ScopedArguments*>(cell)->length(callFrame);
</span><span class="cx"> break;
</span><span class="cx"> case StringType:
</span><ins>+ case SymbolType:
</ins><span class="cx"> callFrame->vm().throwException(callFrame, createInvalidFunctionApplyParameterError(callFrame, arguments));
</span><span class="cx"> return 0;
</span><ins>+
</ins><span class="cx"> default:
</span><del>- ASSERT(arguments.isObject());
</del><ins>+ RELEASE_ASSERT(arguments.isObject());
</ins><span class="cx"> length = getLength(callFrame, jsCast<JSObject*>(cell));
</span><span class="cx"> if (UNLIKELY(callFrame->hadException()))
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoretestsstressapplysecondargumentmustbearraylikejs"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/Source/JavaScriptCore/tests/stress/apply-second-argument-must-be-array-like.js (0 => 203891)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/tests/stress/apply-second-argument-must-be-array-like.js (rev 0)
+++ branches/safari-602-branch/Source/JavaScriptCore/tests/stress/apply-second-argument-must-be-array-like.js 2016-07-29 07:12:56 UTC (rev 203891)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+//@ runDefault
+
+function assert(x) {
+ if (!x)
+ throw Error("Bad");
+}
+
+function shouldThrow(expr) {
+ let testFunc = new Function(expr);
+ for (let i = 0; i < 10000; i++) {
+ let error;
+ try {
+ testFunc();
+ } catch (e) {
+ error = e;
+ }
+ assert(error);
+ }
+}
+
+function shouldNotThrow(expr) {
+ let testFunc = new Function(expr);
+ for (let i = 0; i < 10000; i++) {
+ let error;
+ try {
+ testFunc();
+ } catch (e) {
+ error = e;
+ }
+ assert(!error);
+ }
+}
+
+function foo() { }
+
+shouldThrow("foo.apply(undefined, true)");
+shouldThrow("foo.apply(undefined, false)");
+shouldThrow("foo.apply(undefined, 100)");
+shouldThrow("foo.apply(undefined, 123456789.12345)");
+shouldThrow("foo.apply(undefined, 1.0/1.0)");
+shouldThrow("foo.apply(undefined, 1.0/0)");
+shouldThrow("foo.apply(undefined, 'hello')");
+shouldThrow("foo.apply(undefined, Symbol())");
+
+shouldNotThrow("foo.apply(undefined, undefined)");
+shouldNotThrow("foo.apply(undefined, null)");
+shouldNotThrow("foo.apply(undefined, {})");
+shouldNotThrow("foo.apply(undefined, [])");
+shouldNotThrow("foo.apply(undefined, function(){})");
</ins></span></pre>
</div>
</div>
</body>
</html>