<!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>[197457] 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/197457">197457</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-03-02 11:17:18 -0800 (Wed, 02 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>SIGSEGV in Proxy [[Get]] and [[Set]] recursion
https://bugs.webkit.org/show_bug.cgi?id=154854
Reviewed by Yusuke Suzuki.
We need to be aware of the possibility that the VM
may recurse and that we can stack overflow.
* runtime/ProxyObject.cpp:
(JSC::performProxyGet):
(JSC::ProxyObject::performPut):
* tests/stress/proxy-get-and-set-recursion-stack-overflow.js: Added.
(assert):
(testStackOverflowGet):
(testStackOverflowIndexedGet):
(testStackOverflowSet):
(testStackOverflowIndexedSet):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeProxyObjectcpp">trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressproxygetandsetrecursionstackoverflowjs">trunk/Source/JavaScriptCore/tests/stress/proxy-get-and-set-recursion-stack-overflow.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (197456 => 197457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-02 18:54:03 UTC (rev 197456)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-02 19:17:18 UTC (rev 197457)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-03-02 Saam barati <sbarati@apple.com>
+
+ SIGSEGV in Proxy [[Get]] and [[Set]] recursion
+ https://bugs.webkit.org/show_bug.cgi?id=154854
+
+ Reviewed by Yusuke Suzuki.
+
+ We need to be aware of the possibility that the VM
+ may recurse and that we can stack overflow.
+
+ * runtime/ProxyObject.cpp:
+ (JSC::performProxyGet):
+ (JSC::ProxyObject::performPut):
+ * tests/stress/proxy-get-and-set-recursion-stack-overflow.js: Added.
+ (assert):
+ (testStackOverflowGet):
+ (testStackOverflowIndexedGet):
+ (testStackOverflowSet):
+ (testStackOverflowIndexedSet):
+
</ins><span class="cx"> 2016-03-02 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Use a Move without REX byte when possible
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeProxyObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp (197456 => 197457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-03-02 18:54:03 UTC (rev 197456)
+++ trunk/Source/JavaScriptCore/runtime/ProxyObject.cpp 2016-03-02 19:17:18 UTC (rev 197457)
</span><span class="lines">@@ -80,6 +80,11 @@
</span><span class="cx"> static EncodedJSValue performProxyGet(ExecState* exec, EncodedJSValue thisValue, PropertyName propertyName)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ if (!vm.isSafeToRecurse()) {
+ throwStackOverflowError(exec);
+ return JSValue::encode(JSValue());
+ }
+
</ins><span class="cx"> JSObject* thisObject = jsCast<JSObject*>(JSValue::decode(thisValue)); // This might be a value where somewhere in __proto__ chain lives a ProxyObject.
</span><span class="cx"> JSObject* proxyObjectAsObject = thisObject;
</span><span class="cx"> // FIXME: make it so that custom getters take both the |this| value and the slotBase (property holder).
</span><span class="lines">@@ -345,6 +350,10 @@
</span><span class="cx"> void ProxyObject::performPut(ExecState* exec, JSValue putValue, JSValue thisValue, PropertyName propertyName, PerformDefaultPutFunction performDefaultPut)
</span><span class="cx"> {
</span><span class="cx"> VM& vm = exec->vm();
</span><ins>+ if (!vm.isSafeToRecurse()) {
+ throwStackOverflowError(exec);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> if (vm.propertyNames->isPrivateName(Identifier::fromUid(&vm, propertyName.uid())))
</span><span class="cx"> return performDefaultPut();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressproxygetandsetrecursionstackoverflowjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/proxy-get-and-set-recursion-stack-overflow.js (0 => 197457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/proxy-get-and-set-recursion-stack-overflow.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/proxy-get-and-set-recursion-stack-overflow.js 2016-03-02 19:17:18 UTC (rev 197457)
</span><span class="lines">@@ -0,0 +1,67 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error('bad assertion');
+}
+
+function testStackOverflowGet() {
+ let threw = false;
+ try {
+ let o = {};
+ let p = new Proxy(o, {});
+ Object.setPrototypeOf(o, p);
+ p.anyField;
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "RangeError: Maximum call stack size exceeded.");
+ }
+ assert(threw);
+}
+
+function testStackOverflowIndexedGet(i) {
+ let threw = false;
+ try {
+ let o = {};
+ let p = new Proxy(o, {});
+ Object.setPrototypeOf(o, p);
+ p[i];
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "RangeError: Maximum call stack size exceeded.");
+ }
+ assert(threw);
+}
+
+function testStackOverflowSet() {
+ let threw = false;
+ try {
+ let o = {};
+ let p = new Proxy(o, {});
+ Object.setPrototypeOf(o, p);
+ p.anyField = 50;
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "RangeError: Maximum call stack size exceeded.");
+ }
+ assert(threw);
+}
+
+function testStackOverflowIndexedSet(i) {
+ let threw = false;
+ try {
+ let o = {};
+ let p = new Proxy(o, {});
+ Object.setPrototypeOf(o, p);
+ p[i] = 50;
+ } catch(e) {
+ threw = true;
+ assert(e.toString() === "RangeError: Maximum call stack size exceeded.");
+ }
+ assert(threw);
+}
+
+for (let i = 0; i < 250; i++) {
+ testStackOverflowGet();
+ testStackOverflowIndexedGet(i);
+ testStackOverflowSet();
+ testStackOverflowIndexedSet(i);
+}
</ins></span></pre>
</div>
</div>
</body>
</html>