<!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>[214005] 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/214005">214005</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2017-03-15 13:19:35 -0700 (Wed, 15 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix missing exception checks in Interpreter.cpp.
https://bugs.webkit.org/show_bug.cgi?id=164964
Reviewed by Saam Barati.
* interpreter/Interpreter.cpp:
(JSC::eval):
(JSC::sizeOfVarargs):
(JSC::sizeFrameForVarargs):
(JSC::Interpreter::executeProgram):
(JSC::Interpreter::executeCall):
(JSC::Interpreter::executeConstruct):
(JSC::Interpreter::prepareForRepeatCall):
(JSC::Interpreter::execute):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214004 => 214005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-15 20:00:32 UTC (rev 214004)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-15 20:19:35 UTC (rev 214005)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-03-15 Mark Lam <mark.lam@apple.com>
+
+ Fix missing exception checks in Interpreter.cpp.
+ https://bugs.webkit.org/show_bug.cgi?id=164964
+
+ Reviewed by Saam Barati.
+
+ * interpreter/Interpreter.cpp:
+ (JSC::eval):
+ (JSC::sizeOfVarargs):
+ (JSC::sizeFrameForVarargs):
+ (JSC::Interpreter::executeProgram):
+ (JSC::Interpreter::executeCall):
+ (JSC::Interpreter::executeConstruct):
+ (JSC::Interpreter::prepareForRepeatCall):
+ (JSC::Interpreter::execute):
+
</ins><span class="cx"> 2017-03-15 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Sort Xcode project files
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (214004 => 214005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2017-03-15 20:00:32 UTC (rev 214004)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2017-03-15 20:19:35 UTC (rev 214005)
</span><span class="lines">@@ -137,12 +137,16 @@
</span><span class="cx"> if (!callerCodeBlock->isStrictMode()) {
</span><span class="cx"> if (programSource.is8Bit()) {
</span><span class="cx"> LiteralParser<LChar> preparser(callFrame, programSource.characters8(), programSource.length(), NonStrictJSON);
</span><del>- if (JSValue parsedObject = preparser.tryLiteralParse())
</del><ins>+ if (JSValue parsedObject = preparser.tryLiteralParse()) {
+ scope.release();
</ins><span class="cx"> return parsedObject;
</span><ins>+ }
</ins><span class="cx"> } else {
</span><span class="cx"> LiteralParser<UChar> preparser(callFrame, programSource.characters16(), programSource.length(), NonStrictJSON);
</span><del>- if (JSValue parsedObject = preparser.tryLiteralParse())
- return parsedObject;
</del><ins>+ if (JSValue parsedObject = preparser.tryLiteralParse()) {
+ scope.release();
+ return parsedObject;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -152,6 +156,7 @@
</span><span class="cx"> VariableEnvironment variablesUnderTDZ;
</span><span class="cx"> JSScope::collectClosureVariablesUnderTDZ(callerScopeChain, variablesUnderTDZ);
</span><span class="cx"> eval = DirectEvalExecutable::create(callFrame, makeSource(programSource, callerCodeBlock->source()->sourceOrigin()), callerCodeBlock->isStrictMode(), derivedContextType, isArrowFunctionContext, evalContextType, &variablesUnderTDZ);
</span><ins>+ ASSERT(!!scope.exception() == !eval);
</ins><span class="cx"> if (!eval)
</span><span class="cx"> return jsUndefined();
</span><span class="cx">
</span><span class="lines">@@ -160,6 +165,7 @@
</span><span class="cx">
</span><span class="cx"> JSValue thisValue = callerFrame->thisValue();
</span><span class="cx"> Interpreter* interpreter = vm.interpreter;
</span><ins>+ scope.release();
</ins><span class="cx"> return interpreter->execute(eval, callFrame, thisValue, callerScopeChain);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -193,10 +199,9 @@
</span><span class="cx"> default:
</span><span class="cx"> RELEASE_ASSERT(arguments.isObject());
</span><span class="cx"> length = getLength(callFrame, jsCast<JSObject*>(cell));
</span><del>- RETURN_IF_EXCEPTION(scope, 0);
</del><span class="cx"> break;
</span><span class="cx"> }
</span><del>-
</del><ins>+ RETURN_IF_EXCEPTION(scope, 0);
</ins><span class="cx">
</span><span class="cx"> if (length >= firstVarArgOffset)
</span><span class="cx"> length -= firstVarArgOffset;
</span><span class="lines">@@ -223,7 +228,8 @@
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> unsigned length = sizeOfVarargs(callFrame, arguments, firstVarArgOffset);
</span><del>-
</del><ins>+ RETURN_IF_EXCEPTION(scope, 0);
+
</ins><span class="cx"> CallFrame* calleeFrame = calleeFrameForVarargs(callFrame, numUsedStackSlots, length + 1);
</span><span class="cx"> if (UNLIKELY(length > maxArguments || !vm.ensureStackCapacityFor(calleeFrame->registers()))) {
</span><span class="cx"> throwStackOverflowError(callFrame, scope);
</span><span class="lines">@@ -763,6 +769,7 @@
</span><span class="cx"> parseResult = literalParser.tryJSONPParse(JSONPData, scope->globalObject()->globalObjectMethodTable()->supportsRichSourceInfo(scope->globalObject()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ RETURN_IF_EXCEPTION(throwScope, { });
</ins><span class="cx"> if (parseResult) {
</span><span class="cx"> JSGlobalObject* globalObject = scope->globalObject();
</span><span class="cx"> JSValue result;
</span><span class="lines">@@ -847,7 +854,9 @@
</span><span class="cx"> VMEntryScope entryScope(vm, scope->globalObject());
</span><span class="cx">
</span><span class="cx"> // Compile source to bytecode if necessary:
</span><del>- if (JSObject* error = program->initializeGlobalProperties(vm, callFrame, scope))
</del><ins>+ JSObject* error = program->initializeGlobalProperties(vm, callFrame, scope);
+ ASSERT(!throwScope.exception() || !error);
+ if (UNLIKELY(error))
</ins><span class="cx"> return checkedReturn(throwException(callFrame, throwScope, error));
</span><span class="cx">
</span><span class="cx"> ProgramCodeBlock* codeBlock;
</span><span class="lines">@@ -854,9 +863,9 @@
</span><span class="cx"> {
</span><span class="cx"> CodeBlock* tempCodeBlock;
</span><span class="cx"> JSObject* error = program->prepareForExecution<ProgramExecutable>(vm, nullptr, scope, CodeForCall, tempCodeBlock);
</span><del>- ASSERT(!throwScope.exception() || throwScope.exception() == jsDynamicCast<Exception*>(vm, error));
- if (error)
- return checkedReturn(throwException(callFrame, throwScope, error));
</del><ins>+ ASSERT(throwScope.exception() == reinterpret_cast<Exception*>(error));
+ if (UNLIKELY(error))
+ return checkedReturn(error);
</ins><span class="cx"> codeBlock = jsCast<ProgramCodeBlock*>(tempCodeBlock);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -875,8 +884,8 @@
</span><span class="cx"> protoCallFrame.init(codeBlock, JSCallee::create(vm, scope->globalObject(), scope), thisObj, 1);
</span><span class="cx">
</span><span class="cx"> // Execute the code:
</span><ins>+ throwScope.release();
</ins><span class="cx"> JSValue result = program->generatedJITCode()->execute(&vm, &protoCallFrame);
</span><del>- throwScope.release();
</del><span class="cx"> return checkedReturn(result);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -914,7 +923,7 @@
</span><span class="cx"> JSObject* compileError = callData.js.functionExecutable->prepareForExecution<FunctionExecutable>(vm, jsCast<JSFunction*>(function), scope, CodeForCall, newCodeBlock);
</span><span class="cx"> ASSERT(throwScope.exception() == reinterpret_cast<Exception*>(compileError));
</span><span class="cx"> if (UNLIKELY(!!compileError))
</span><del>- return checkedReturn(throwException(callFrame, throwScope, compileError));
</del><ins>+ return checkedReturn(compileError);
</ins><span class="cx">
</span><span class="cx"> ASSERT(!!newCodeBlock);
</span><span class="cx"> newCodeBlock->m_shouldAlwaysBeInlined = false;
</span><span class="lines">@@ -934,8 +943,8 @@
</span><span class="cx"> {
</span><span class="cx"> // Execute the code:
</span><span class="cx"> if (isJSCall) {
</span><ins>+ throwScope.release();
</ins><span class="cx"> result = callData.js.functionExecutable->generatedJITCodeForCall()->execute(&vm, &protoCallFrame);
</span><del>- throwScope.release();
</del><span class="cx"> } else {
</span><span class="cx"> result = JSValue::decode(vmEntryToNative(reinterpret_cast<void*>(callData.native.function), &vm, &protoCallFrame));
</span><span class="cx"> RETURN_IF_EXCEPTION(throwScope, JSValue());
</span><span class="lines">@@ -979,8 +988,9 @@
</span><span class="cx"> if (isJSConstruct) {
</span><span class="cx"> // Compile the callee:
</span><span class="cx"> JSObject* compileError = constructData.js.functionExecutable->prepareForExecution<FunctionExecutable>(vm, jsCast<JSFunction*>(constructor), scope, CodeForConstruct, newCodeBlock);
</span><ins>+ ASSERT(throwScope.exception() == reinterpret_cast<Exception*>(compileError));
</ins><span class="cx"> if (UNLIKELY(!!compileError))
</span><del>- return checkedReturn(throwException(callFrame, throwScope, compileError));
</del><ins>+ return checkedReturn(compileError);
</ins><span class="cx">
</span><span class="cx"> ASSERT(!!newCodeBlock);
</span><span class="cx"> newCodeBlock->m_shouldAlwaysBeInlined = false;
</span><span class="lines">@@ -1018,7 +1028,7 @@
</span><span class="cx"> {
</span><span class="cx"> VM& vm = *scope->vm();
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- ASSERT(!throwScope.exception());
</del><ins>+ ASSERT_UNUSED(throwScope, !throwScope.exception());
</ins><span class="cx">
</span><span class="cx"> if (vm.isCollectorBusyOnCurrentThread())
</span><span class="cx"> return CallFrameClosure();
</span><span class="lines">@@ -1026,10 +1036,9 @@
</span><span class="cx"> // Compile the callee:
</span><span class="cx"> CodeBlock* newCodeBlock;
</span><span class="cx"> JSObject* error = functionExecutable->prepareForExecution<FunctionExecutable>(vm, function, scope, CodeForCall, newCodeBlock);
</span><del>- if (error) {
- throwException(callFrame, throwScope, error);
</del><ins>+ ASSERT(throwScope.exception() == reinterpret_cast<Exception*>(error));
+ if (UNLIKELY(error))
</ins><span class="cx"> return CallFrameClosure();
</span><del>- }
</del><span class="cx"> newCodeBlock->m_shouldAlwaysBeInlined = false;
</span><span class="cx">
</span><span class="cx"> size_t argsCount = argumentCountIncludingThis;
</span><span class="lines">@@ -1059,6 +1068,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Execute the code:
</span><ins>+ throwScope.release();
</ins><span class="cx"> JSValue result = closure.functionExecutable->generatedJITCodeForCall()->execute(&vm, closure.protoCallFrame);
</span><span class="cx">
</span><span class="cx"> return checkedReturn(result);
</span><span class="lines">@@ -1108,8 +1118,9 @@
</span><span class="cx"> {
</span><span class="cx"> CodeBlock* tempCodeBlock;
</span><span class="cx"> JSObject* compileError = eval->prepareForExecution<EvalExecutable>(vm, nullptr, scope, CodeForCall, tempCodeBlock);
</span><ins>+ ASSERT(throwScope.exception() == reinterpret_cast<Exception*>(compileError));
</ins><span class="cx"> if (UNLIKELY(!!compileError))
</span><del>- return checkedReturn(throwException(callFrame, throwScope, compileError));
</del><ins>+ return checkedReturn(compileError);
</ins><span class="cx"> codeBlock = jsCast<EvalCodeBlock*>(tempCodeBlock);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1143,9 +1154,12 @@
</span><span class="cx">
</span><span class="cx"> for (unsigned i = 0; i < numVariables; ++i) {
</span><span class="cx"> const Identifier& ident = codeBlock->variable(i);
</span><del>- if (!variableObject->hasProperty(callFrame, ident)) {
</del><ins>+ bool hasProperty = variableObject->hasProperty(callFrame, ident);
+ RETURN_IF_EXCEPTION(throwScope, checkedReturn(throwScope.exception()));
+ if (!hasProperty) {
</ins><span class="cx"> PutPropertySlot slot(variableObject);
</span><span class="cx"> variableObject->methodTable()->put(variableObject, callFrame, ident, jsUndefined(), slot);
</span><ins>+ RETURN_IF_EXCEPTION(throwScope, checkedReturn(throwScope.exception()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1153,6 +1167,7 @@
</span><span class="cx"> FunctionExecutable* function = codeBlock->functionDecl(i);
</span><span class="cx"> PutPropertySlot slot(variableObject);
</span><span class="cx"> variableObject->methodTable()->put(variableObject, callFrame, function->name(), JSFunction::create(vm, function, scope), slot);
</span><ins>+ RETURN_IF_EXCEPTION(throwScope, checkedReturn(throwScope.exception()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1168,6 +1183,7 @@
</span><span class="cx"> protoCallFrame.init(codeBlock, JSCallee::create(vm, scope->globalObject(), scope), thisValue, 1);
</span><span class="cx">
</span><span class="cx"> // Execute the code:
</span><ins>+ throwScope.release();
</ins><span class="cx"> JSValue result = eval->generatedJITCode()->execute(&vm, &protoCallFrame);
</span><span class="cx">
</span><span class="cx"> return checkedReturn(result);
</span><span class="lines">@@ -1193,8 +1209,9 @@
</span><span class="cx"> {
</span><span class="cx"> CodeBlock* tempCodeBlock;
</span><span class="cx"> JSObject* compileError = executable->prepareForExecution<ModuleProgramExecutable>(vm, nullptr, scope, CodeForCall, tempCodeBlock);
</span><ins>+ ASSERT(throwScope.exception() == reinterpret_cast<Exception*>(compileError));
</ins><span class="cx"> if (UNLIKELY(!!compileError))
</span><del>- return checkedReturn(throwException(callFrame, throwScope, compileError));
</del><ins>+ return checkedReturn(compileError);
</ins><span class="cx"> codeBlock = jsCast<ModuleProgramCodeBlock*>(tempCodeBlock);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1216,6 +1233,7 @@
</span><span class="cx"> protoCallFrame.init(codeBlock, JSCallee::create(vm, scope->globalObject(), scope), jsUndefined(), 1);
</span><span class="cx">
</span><span class="cx"> // Execute the code:
</span><ins>+ throwScope.release();
</ins><span class="cx"> JSValue result = executable->generatedJITCode()->execute(&vm, &protoCallFrame);
</span><span class="cx">
</span><span class="cx"> return checkedReturn(result);
</span></span></pre>
</div>
</div>
</body>
</html>