<!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>[208935] 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/208935">208935</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-11-20 17:31:20 -0800 (Sun, 20 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix exception scope verification failures in DateConstructor.cpp and DatePrototype.cpp.
https://bugs.webkit.org/show_bug.cgi?id=164995
Reviewed by Darin Adler.
* runtime/DateConstructor.cpp:
(JSC::millisecondsFromComponents):
(JSC::constructDate):
* runtime/DatePrototype.cpp:
(JSC::dateProtoFuncToPrimitiveSymbol):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDateConstructorcpp">trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeDatePrototypecpp">trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208934 => 208935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-21 00:57:27 UTC (rev 208934)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-21 01:31:20 UTC (rev 208935)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-20 Mark Lam <mark.lam@apple.com>
+
+ Fix exception scope verification failures in DateConstructor.cpp and DatePrototype.cpp.
+ https://bugs.webkit.org/show_bug.cgi?id=164995
+
+ Reviewed by Darin Adler.
+
+ * runtime/DateConstructor.cpp:
+ (JSC::millisecondsFromComponents):
+ (JSC::constructDate):
+ * runtime/DatePrototype.cpp:
+ (JSC::dateProtoFuncToPrimitiveSymbol):
+
</ins><span class="cx"> 2016-11-20 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] speed up parsing of async functions
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDateConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp (208934 => 208935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp 2016-11-21 00:57:27 UTC (rev 208934)
+++ trunk/Source/JavaScriptCore/runtime/DateConstructor.cpp 2016-11-21 01:31:20 UTC (rev 208935)
</span><span class="lines">@@ -109,16 +109,15 @@
</span><span class="cx">
</span><span class="cx"> static double millisecondsFromComponents(ExecState* exec, const ArgList& args, WTF::TimeType timeType)
</span><span class="cx"> {
</span><del>- double doubleArguments[] = {
- args.at(0).toNumber(exec),
- args.at(1).toNumber(exec),
- args.at(2).toNumber(exec),
- args.at(3).toNumber(exec),
- args.at(4).toNumber(exec),
- args.at(5).toNumber(exec),
- args.at(6).toNumber(exec)
- };
</del><ins>+ VM& vm = exec->vm();
+ auto scope = DECLARE_THROW_SCOPE(vm);
</ins><span class="cx">
</span><ins>+ double doubleArguments[7];
+ for (int i = 0; i < 7; i++) {
+ doubleArguments[i] = args.at(i).toNumber(exec);
+ RETURN_IF_EXCEPTION(scope, 0);
+ }
+
</ins><span class="cx"> int numArgs = args.size();
</span><span class="cx">
</span><span class="cx"> if ((!std::isfinite(doubleArguments[0]) || (doubleArguments[0] > INT_MAX) || (doubleArguments[0] < INT_MIN))
</span><span class="lines">@@ -140,7 +139,7 @@
</span><span class="cx"> t.setSecond(JSC::toInt32(doubleArguments[5]));
</span><span class="cx"> t.setIsDST(-1);
</span><span class="cx"> double ms = (numArgs >= 7) ? doubleArguments[6] : 0;
</span><del>- return gregorianDateTimeToMS(exec->vm(), t, ms, timeType);
</del><ins>+ return gregorianDateTimeToMS(vm, t, ms, timeType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ECMA 15.9.3
</span><span class="lines">@@ -159,6 +158,7 @@
</span><span class="cx"> value = asDateInstance(args.at(0))->internalNumber();
</span><span class="cx"> else {
</span><span class="cx"> JSValue primitive = args.at(0).toPrimitive(exec);
</span><ins>+ RETURN_IF_EXCEPTION(scope, nullptr);
</ins><span class="cx"> if (primitive.isString())
</span><span class="cx"> value = parseDate(vm, primitive.getString(exec));
</span><span class="cx"> else
</span><span class="lines">@@ -166,6 +166,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> value = millisecondsFromComponents(exec, args, WTF::LocalTime);
</span><ins>+ RETURN_IF_EXCEPTION(scope, nullptr);
</ins><span class="cx">
</span><span class="cx"> Structure* dateStructure = InternalFunction::createSubclassStructure(exec, newTarget, globalObject->dateStructure());
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, nullptr);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeDatePrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp (208934 => 208935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp 2016-11-21 00:57:27 UTC (rev 208934)
+++ trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp 2016-11-21 01:31:20 UTC (rev 208935)
</span><span class="lines">@@ -620,6 +620,7 @@
</span><span class="cx"> if (type == NoPreference)
</span><span class="cx"> type = PreferString;
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(thisObject->ordinaryToPrimitive(exec, type));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>