<!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>[208923] 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/208923">208923</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-11-19 00:03:48 -0800 (Sat, 19 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix missing exception checks in JSC inspector files.
https://bugs.webkit.org/show_bug.cgi?id=164959
Reviewed by Saam Barati.
* inspector/JSInjectedScriptHost.cpp:
(Inspector::JSInjectedScriptHost::getInternalProperties):
(Inspector::JSInjectedScriptHost::weakMapEntries):
(Inspector::JSInjectedScriptHost::weakSetEntries):
(Inspector::JSInjectedScriptHost::iteratorEntries):
* inspector/JSJavaScriptCallFrame.cpp:
(Inspector::JSJavaScriptCallFrame::scopeDescriptions):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp">trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp">trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (208922 => 208923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-19 08:02:03 UTC (rev 208922)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-19 08:03:48 UTC (rev 208923)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-11-19 Mark Lam <mark.lam@apple.com>
+
+ Fix missing exception checks in JSC inspector files.
+ https://bugs.webkit.org/show_bug.cgi?id=164959
+
+ Reviewed by Saam Barati.
+
+ * inspector/JSInjectedScriptHost.cpp:
+ (Inspector::JSInjectedScriptHost::getInternalProperties):
+ (Inspector::JSInjectedScriptHost::weakMapEntries):
+ (Inspector::JSInjectedScriptHost::weakSetEntries):
+ (Inspector::JSInjectedScriptHost::iteratorEntries):
+ * inspector/JSJavaScriptCallFrame.cpp:
+ (Inspector::JSJavaScriptCallFrame::scopeDescriptions):
+
</ins><span class="cx"> 2016-11-18 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix missing exception checks in DFGOperations.cpp.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSInjectedScriptHostcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp (208922 => 208923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-11-19 08:02:03 UTC (rev 208922)
+++ trunk/Source/JavaScriptCore/inspector/JSInjectedScriptHost.cpp 2016-11-19 08:03:48 UTC (rev 208923)
</span><span class="lines">@@ -269,19 +269,24 @@
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx"> switch (promise->status(exec->vm())) {
</span><span class="cx"> case JSPromise::Status::Pending:
</span><ins>+ scope.release();
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("status"), jsNontrivialString(exec, ASCIILiteral("pending"))));
</span><del>- break;
</del><ins>+ return array;
</ins><span class="cx"> case JSPromise::Status::Fulfilled:
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("status"), jsNontrivialString(exec, ASCIILiteral("resolved"))));
</span><ins>+ RETURN_IF_EXCEPTION(scope, JSValue());
+ scope.release();
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("result"), promise->result(exec->vm())));
</span><del>- break;
</del><ins>+ return array;
</ins><span class="cx"> case JSPromise::Status::Rejected:
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("status"), jsNontrivialString(exec, ASCIILiteral("rejected"))));
</span><ins>+ RETURN_IF_EXCEPTION(scope, JSValue());
+ scope.release();
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("result"), promise->result(exec->vm())));
</span><del>- break;
</del><ins>+ return array;
</ins><span class="cx"> }
</span><span class="cx"> // FIXME: <https://webkit.org/b/141664> Web Inspector: ES6: Improved Support for Promises - Promise Reactions
</span><del>- return array;
</del><ins>+ RELEASE_ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (JSBoundFunction* boundFunction = jsDynamicCast<JSBoundFunction*>(value)) {
</span><span class="lines">@@ -289,9 +294,14 @@
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "targetFunction", boundFunction->targetFunction()));
</span><ins>+ RETURN_IF_EXCEPTION(scope, JSValue());
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "boundThis", boundFunction->boundThis()));
</span><del>- if (boundFunction->boundArgs())
</del><ins>+ RETURN_IF_EXCEPTION(scope, JSValue());
+ if (boundFunction->boundArgs()) {
+ scope.release();
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "boundArgs", boundFunction->boundArgs()));
</span><ins>+ return array;
+ }
</ins><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -300,6 +310,8 @@
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 2);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("target"), proxy->target()));
</span><ins>+ RETURN_IF_EXCEPTION(scope, JSValue());
+ scope.release();
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, ASCIILiteral("handler"), proxy->handler()));
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="lines">@@ -313,6 +325,8 @@
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 2);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "array", iteratedValue));
</span><ins>+ RETURN_IF_EXCEPTION(scope, JSValue());
+ scope.release();
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", kind));
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="lines">@@ -335,6 +349,8 @@
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 2);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "map", mapIterator->iteratedValue()));
</span><ins>+ RETURN_IF_EXCEPTION(scope, JSValue());
+ scope.release();
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", jsNontrivialString(exec, kind)));
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="lines">@@ -356,6 +372,8 @@
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 2);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "set", setIterator->iteratedValue()));
</span><ins>+ RETURN_IF_EXCEPTION(scope, JSValue());
+ scope.release();
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "kind", jsNontrivialString(exec, kind)));
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="lines">@@ -364,6 +382,7 @@
</span><span class="cx"> unsigned index = 0;
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 1);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "string", stringIterator->iteratedValue(exec)));
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="lines">@@ -372,6 +391,7 @@
</span><span class="cx"> unsigned index = 0;
</span><span class="cx"> JSArray* array = constructEmptyArray(exec, nullptr, 1);
</span><span class="cx"> RETURN_IF_EXCEPTION(scope, JSValue());
</span><ins>+ scope.release();
</ins><span class="cx"> array->putDirectIndex(exec, index++, constructInternalProperty(exec, "object", propertyNameIterator->iteratedValue()));
</span><span class="cx"> return array;
</span><span class="cx"> }
</span><span class="lines">@@ -436,6 +456,7 @@
</span><span class="cx"> entry->putDirect(exec->vm(), Identifier::fromString(exec, "key"), it->key);
</span><span class="cx"> entry->putDirect(exec->vm(), Identifier::fromString(exec, "value"), it->value.get());
</span><span class="cx"> array->putDirectIndex(exec, fetched++, entry);
</span><ins>+ RETURN_IF_EXCEPTION(scope, JSValue());
</ins><span class="cx"> if (numberToFetch && fetched >= numberToFetch)
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -482,6 +503,7 @@
</span><span class="cx"> JSObject* entry = constructEmptyObject(exec);
</span><span class="cx"> entry->putDirect(exec->vm(), Identifier::fromString(exec, "value"), it->key);
</span><span class="cx"> array->putDirectIndex(exec, fetched++, entry);
</span><ins>+ RETURN_IF_EXCEPTION(scope, JSValue());
</ins><span class="cx"> if (numberToFetch && fetched >= numberToFetch)
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -552,6 +574,8 @@
</span><span class="cx"> JSObject* entry = constructEmptyObject(exec);
</span><span class="cx"> entry->putDirect(exec->vm(), Identifier::fromString(exec, "value"), nextValue);
</span><span class="cx"> array->putDirectIndex(exec, i, entry);
</span><ins>+ if (UNLIKELY(scope.exception()))
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> iteratorClose(exec, iterator);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorJSJavaScriptCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp (208922 => 208923)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2016-11-19 08:02:03 UTC (rev 208922)
+++ trunk/Source/JavaScriptCore/inspector/JSJavaScriptCallFrame.cpp 2016-11-19 08:03:48 UTC (rev 208923)
</span><span class="lines">@@ -128,6 +128,9 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSJavaScriptCallFrame::scopeDescriptions(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ VM& vm = exec->vm();
+ auto throwScope = DECLARE_THROW_SCOPE(vm);
+
</ins><span class="cx"> DebuggerScope* scopeChain = impl().scopeChain();
</span><span class="cx"> if (!scopeChain)
</span><span class="cx"> return jsUndefined();
</span><span class="lines">@@ -143,6 +146,7 @@
</span><span class="cx"> description->putDirect(exec->vm(), Identifier::fromString(exec, "name"), jsString(exec, scope->name()));
</span><span class="cx"> description->putDirect(exec->vm(), Identifier::fromString(exec, "location"), valueForScopeLocation(exec, scope->location()));
</span><span class="cx"> array->putDirectIndex(exec, index++, description);
</span><ins>+ RETURN_IF_EXCEPTION(throwScope, JSValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return array;
</span></span></pre>
</div>
</div>
</body>
</html>