<!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>[208913] 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/208913">208913</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-11-18 17:46:01 -0800 (Fri, 18 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix missing exception checks in DFGOperations.cpp.
https://bugs.webkit.org/show_bug.cgi?id=164958
Reviewed by Geoffrey Garen.
* dfg/DFGOperations.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGOperationscpp">trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208912 => 208913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-19 01:40:14 UTC (rev 208912)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-19 01:46:01 UTC (rev 208913)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><span class="cx"> 2016-11-18 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ Fix missing exception checks in DFGOperations.cpp.
+ https://bugs.webkit.org/show_bug.cgi?id=164958
+
+ Reviewed by Geoffrey Garen.
+
+ * dfg/DFGOperations.cpp:
+
+2016-11-18 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> Fix exception scope verification failures in ShadowChicken.cpp.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164966
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp (208912 => 208913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2016-11-19 01:40:14 UTC (rev 208912)
+++ trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp 2016-11-19 01:46:01 UTC (rev 208913)
</span><span class="lines">@@ -110,6 +110,7 @@
</span><span class="cx"> if (LIKELY(property.isUInt32())) {
</span><span class="cx"> // Despite its name, JSValue::isUInt32 will return true only for positive boxed int32_t; all those values are valid array indices.
</span><span class="cx"> ASSERT(isIndex(property.asUInt32()));
</span><ins>+ scope.release();
</ins><span class="cx"> putByVal<strict, direct>(exec, baseValue, property.asUInt32(), value);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -118,6 +119,7 @@
</span><span class="cx"> double propertyAsDouble = property.asDouble();
</span><span class="cx"> uint32_t propertyAsUInt32 = static_cast<uint32_t>(propertyAsDouble);
</span><span class="cx"> if (propertyAsDouble == propertyAsUInt32 && isIndex(propertyAsUInt32)) {
</span><ins>+ scope.release();
</ins><span class="cx"> putByVal<strict, direct>(exec, baseValue, propertyAsUInt32, value);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -130,12 +132,16 @@
</span><span class="cx"> PutPropertySlot slot(baseValue, strict);
</span><span class="cx"> if (direct) {
</span><span class="cx"> RELEASE_ASSERT(baseValue.isObject());
</span><del>- if (Optional<uint32_t> index = parseIndex(propertyName))
</del><ins>+ if (Optional<uint32_t> index = parseIndex(propertyName)) {
+ scope.release();
</ins><span class="cx"> asObject(baseValue)->putDirectIndex(exec, index.value(), value, 0, strict ? PutDirectIndexShouldThrow : PutDirectIndexShouldNotThrow);
</span><del>- else
- asObject(baseValue)->putDirect(*vm, propertyName, value, slot);
- } else
- baseValue.put(exec, propertyName, value, slot);
</del><ins>+ return;
+ }
+ asObject(baseValue)->putDirect(*vm, propertyName, value, slot);
+ return;
+ }
+ scope.release();
+ baseValue.put(exec, propertyName, value, slot);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename ViewClass>
</span><span class="lines">@@ -152,7 +158,8 @@
</span><span class="cx">
</span><span class="cx"> if (vector)
</span><span class="cx"> return bitwise_cast<char*>(ViewClass::createWithFastVector(exec, structure, size, vector));
</span><del>-
</del><ins>+
+ scope.release();
</ins><span class="cx"> return bitwise_cast<char*>(ViewClass::create(exec, structure, size));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -189,8 +196,11 @@
</span><span class="cx"> VM& vm = exec->vm();
</span><span class="cx"> NativeCallFrameTracer tracer(&vm, exec);
</span><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><del>- if (constructor->type() == JSFunctionType)
- return constructEmptyObject(exec, jsCast<JSFunction*>(constructor)->rareData(exec, inlineCapacity)->objectAllocationProfile()->structure());
</del><ins>+ if (constructor->type() == JSFunctionType) {
+ auto rareData = jsCast<JSFunction*>(constructor)->rareData(exec, inlineCapacity);
+ RETURN_IF_EXCEPTION(scope, nullptr);
+ return constructEmptyObject(exec, rareData->objectAllocationProfile()->structure());
+ }
</ins><span class="cx">
</span><span class="cx"> JSValue proto = constructor->get(exec, exec->propertyNames().prototype);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, nullptr);
</span><span class="lines">@@ -223,6 +233,7 @@
</span><span class="cx">
</span><span class="cx"> int32_t a = op1.toInt32(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> int32_t b = op2.toInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a & b));
</span><span class="cx"> }
</span><span class="lines">@@ -238,6 +249,7 @@
</span><span class="cx">
</span><span class="cx"> int32_t a = op1.toInt32(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> int32_t b = op2.toInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a | b));
</span><span class="cx"> }
</span><span class="lines">@@ -253,6 +265,7 @@
</span><span class="cx">
</span><span class="cx"> int32_t a = op1.toInt32(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> int32_t b = op2.toInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a ^ b));
</span><span class="cx"> }
</span><span class="lines">@@ -268,6 +281,7 @@
</span><span class="cx">
</span><span class="cx"> int32_t a = op1.toInt32(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> uint32_t b = op2.toUInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a << (b & 0x1f)));
</span><span class="cx"> }
</span><span class="lines">@@ -283,6 +297,7 @@
</span><span class="cx">
</span><span class="cx"> int32_t a = op1.toInt32(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> uint32_t b = op2.toUInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a >> (b & 0x1f)));
</span><span class="cx"> }
</span><span class="lines">@@ -298,6 +313,7 @@
</span><span class="cx">
</span><span class="cx"> uint32_t a = op1.toUInt32(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> uint32_t b = op2.toUInt32(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(static_cast<int32_t>(a >> (b & 0x1f))));
</span><span class="cx"> }
</span><span class="lines">@@ -329,6 +345,7 @@
</span><span class="cx">
</span><span class="cx"> double a = op1.toNumber(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> double b = op2.toNumber(exec);
</span><span class="cx"> return JSValue::encode(jsNumber(a / b));
</span><span class="cx"> }
</span><span class="lines">@@ -506,13 +523,17 @@
</span><span class="cx"> if (LIKELY(baseValue.isCell())) {
</span><span class="cx"> JSCell* base = baseValue.asCell();
</span><span class="cx">
</span><del>- if (property.isUInt32())
</del><ins>+ if (property.isUInt32()) {
+ scope.release();
</ins><span class="cx"> return getByVal(exec, base, property.asUInt32());
</span><del>- else if (property.isDouble()) {
</del><ins>+ }
+ if (property.isDouble()) {
</ins><span class="cx"> double propertyAsDouble = property.asDouble();
</span><span class="cx"> uint32_t propertyAsUInt32 = static_cast<uint32_t>(propertyAsDouble);
</span><del>- if (propertyAsUInt32 == propertyAsDouble && isIndex(propertyAsUInt32))
</del><ins>+ if (propertyAsUInt32 == propertyAsDouble && isIndex(propertyAsUInt32)) {
+ scope.release();
</ins><span class="cx"> return getByVal(exec, base, propertyAsUInt32);
</span><ins>+ }
</ins><span class="cx"> } else if (property.isString()) {
</span><span class="cx"> Structure& structure = *base->structure(vm);
</span><span class="cx"> if (JSCell::canUseFastGetOwnProperty(structure)) {
</span><span class="lines">@@ -528,6 +549,7 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><span class="cx"> auto propertyName = property.toPropertyKey(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(baseValue.get(exec, propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -954,6 +976,7 @@
</span><span class="cx"> if (isJSString(baseValue) && asString(baseValue)->canGetIndex(i))
</span><span class="cx"> return JSValue::encode(asString(baseValue)->getIndex(exec, i));
</span><span class="cx">
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(baseValue.get(exec, i, slot));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -962,6 +985,7 @@
</span><span class="cx">
</span><span class="cx"> auto property = subscript.toPropertyKey(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, encodedJSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> return JSValue::encode(baseValue.get(exec, property, slot));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -989,6 +1013,7 @@
</span><span class="cx">
</span><span class="cx"> Identifier property = JSValue::decode(encodedSubscript).toPropertyKey(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, void());
</span><ins>+ scope.release();
</ins><span class="cx"> putWithThis<true>(exec, encodedBase, encodedThis, encodedValue, property);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1000,6 +1025,7 @@
</span><span class="cx">
</span><span class="cx"> Identifier property = JSValue::decode(encodedSubscript).toPropertyKey(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, void());
</span><ins>+ scope.release();
</ins><span class="cx"> putWithThis<false>(exec, encodedBase, encodedThis, encodedValue, property);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1021,6 +1047,7 @@
</span><span class="cx">
</span><span class="cx"> Identifier propertyName = JSValue::decode(encodedProperty).toPropertyKey(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, void());
</span><ins>+ scope.release();
</ins><span class="cx"> defineDataProperty(exec, vm, base, propertyName, JSValue::decode(encodedValue), attributes);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1032,6 +1059,7 @@
</span><span class="cx">
</span><span class="cx"> Identifier propertyName = property->toIdentifier(exec);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, void());
</span><ins>+ scope.release();
</ins><span class="cx"> defineDataProperty(exec, vm, base, propertyName, JSValue::decode(encodedValue), attributes);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1943,6 +1971,7 @@
</span><span class="cx">
</span><span class="cx"> if (isJSArray(iterable) && globalObject->isArrayIteratorProtocolFastAndNonObservable()) {
</span><span class="cx"> JSArray* array = jsCast<JSArray*>(iterable);
</span><ins>+ throwScope.release();
</ins><span class="cx"> return JSFixedArray::createFromArray(exec, vm, array);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1963,6 +1992,7 @@
</span><span class="cx"> array = jsCast<JSArray*>(arrayResult);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ throwScope.release();
</ins><span class="cx"> return JSFixedArray::createFromArray(exec, vm, array);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2040,6 +2070,7 @@
</span><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> Identifier ident = Identifier::fromUid(exec, impl);
</span><ins>+ throwScope.release();
</ins><span class="cx"> return JSValue::encode(scope->getPropertySlot(exec, ident, [&] (bool found, PropertySlot& slot) -> JSValue {
</span><span class="cx"> if (!found) {
</span><span class="cx"> GetPutInfo getPutInfo(getPutInfoBits);
</span><span class="lines">@@ -2071,6 +2102,7 @@
</span><span class="cx"> const Identifier& ident = Identifier::fromUid(exec, impl);
</span><span class="cx"> GetPutInfo getPutInfo(getPutInfoBits);
</span><span class="cx"> bool hasProperty = scope->hasProperty(exec, ident);
</span><ins>+ RETURN_IF_EXCEPTION(throwScope, void());
</ins><span class="cx"> if (hasProperty
</span><span class="cx"> && scope->isGlobalLexicalEnvironment()
</span><span class="cx"> && !isInitialization(getPutInfo.initializationMode())) {
</span><span class="lines">@@ -2095,6 +2127,7 @@
</span><span class="cx"> else
</span><span class="cx"> strictMode = exec->codeBlock()->isStrictMode();
</span><span class="cx"> PutPropertySlot slot(scope, strictMode, PutPropertySlot::UnknownContext, isInitialization(getPutInfo.initializationMode()));
</span><ins>+ throwScope.release();
</ins><span class="cx"> scope->methodTable()->put(scope, exec, ident, JSValue::decode(value), slot);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>