<!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>[209218] branches/safari-602-branch</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/209218">209218</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-12-01 14:55:40 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/209149">r209149</a>. rdar://problem/29404230</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsChangeLog">branches/safari-602-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreChangeLog">branches/safari-602-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceJavaScriptCoreruntimeExecutablecpp">branches/safari-602-branch/Source/JavaScriptCore/runtime/Executable.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari602branchLayoutTestsjsdomproxyisnotallowedinglobalprototypechainexpectedtxt">branches/safari-602-branch/LayoutTests/js/dom/proxy-is-not-allowed-in-global-prototype-chain-expected.txt</a></li>
<li><a href="#branchessafari602branchLayoutTestsjsdomproxyisnotallowedinglobalprototypechainhtml">branches/safari-602-branch/LayoutTests/js/dom/proxy-is-not-allowed-in-global-prototype-chain.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/LayoutTests/ChangeLog (209217 => 209218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/ChangeLog 2016-12-01 22:54:52 UTC (rev 209217)
+++ branches/safari-602-branch/LayoutTests/ChangeLog 2016-12-01 22:55:40 UTC (rev 209218)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-12-01 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r209149. rdar://problem/29404230
+
+ 2016-11-30 Mark Lam <mark.lam@apple.com>
+
+ Proxy is not allowed in the global prototype chain.
+ https://bugs.webkit.org/show_bug.cgi?id=165205
+
+ Reviewed by Geoffrey Garen.
+
+ * js/dom/proxy-is-not-allowed-in-global-prototype-chain-expected.txt: Added.
+ * js/dom/proxy-is-not-allowed-in-global-prototype-chain.html: Added.
+
+2016-12-01 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r209145. rdar://problem/29404231
</span><span class="cx">
</span><span class="cx"> 2016-11-30 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchLayoutTestsjsdomproxyisnotallowedinglobalprototypechainexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/js/dom/proxy-is-not-allowed-in-global-prototype-chain-expected.txt (0 => 209218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/js/dom/proxy-is-not-allowed-in-global-prototype-chain-expected.txt (rev 0)
+++ branches/safari-602-branch/LayoutTests/js/dom/proxy-is-not-allowed-in-global-prototype-chain-expected.txt 2016-12-01 22:55:40 UTC (rev 209218)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+CONSOLE MESSAGE: TypeError: Proxy is not allowed in the global prototype chain.
+onerror saw TypeError: Proxy is not allowed in the global prototype chain.
+
</ins></span></pre></div>
<a id="branchessafari602branchLayoutTestsjsdomproxyisnotallowedinglobalprototypechainhtml"></a>
<div class="addfile"><h4>Added: branches/safari-602-branch/LayoutTests/js/dom/proxy-is-not-allowed-in-global-prototype-chain.html (0 => 209218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/LayoutTests/js/dom/proxy-is-not-allowed-in-global-prototype-chain.html (rev 0)
+++ branches/safari-602-branch/LayoutTests/js/dom/proxy-is-not-allowed-in-global-prototype-chain.html 2016-12-01 22:55:40 UTC (rev 209218)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<pre id="console"></pre>
+
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+window.onerror = function(e) {
+ log("onerror saw " + e);
+}
+
+try {
+ var proto = window.__proto__.__proto__.__proto__;
+ proto.__proto__ = new Proxy(proto.__proto__, {
+ has(target, prop) {
+ log("FAIL: proxy saw " + prop);
+ }
+ });
+
+} catch (e) {
+ log("Caught: " + e);
+ log(e.stack);
+}
+
+function log(s)
+{
+ document.getElementById("console").appendChild(document.createTextNode(s + "\n"));
+}
+</script>
+
+<script>var undefined_variable</script>
</ins></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/ChangeLog (209217 => 209218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-12-01 22:54:52 UTC (rev 209217)
+++ branches/safari-602-branch/Source/JavaScriptCore/ChangeLog 2016-12-01 22:55:40 UTC (rev 209218)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-12-01 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r209149. rdar://problem/29404230
+
+ 2016-11-30 Mark Lam <mark.lam@apple.com>
+
+ Proxy is not allowed in the global prototype chain.
+ https://bugs.webkit.org/show_bug.cgi?id=165205
+
+ Reviewed by Geoffrey Garen.
+
+ * runtime/ProgramExecutable.cpp:
+ (JSC::ProgramExecutable::initializeGlobalProperties):
+ - We'll now throw a TypeError if we detect a Proxy in the global prototype chain.
+
</ins><span class="cx"> 2016-11-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r208619. rdar://problem/29225966
</span></span></pre></div>
<a id="branchessafari602branchSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/JavaScriptCore/runtime/Executable.cpp (209217 => 209218)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/JavaScriptCore/runtime/Executable.cpp 2016-12-01 22:54:52 UTC (rev 209217)
+++ branches/safari-602-branch/Source/JavaScriptCore/runtime/Executable.cpp 2016-12-01 22:55:40 UTC (rev 209218)
</span><span class="lines">@@ -584,6 +584,15 @@
</span><span class="cx"> RELEASE_ASSERT(globalObject);
</span><span class="cx"> ASSERT(&globalObject->vm() == &vm);
</span><span class="cx">
</span><ins>+ JSValue nextPrototype = globalObject->getPrototypeDirect();
+ while (nextPrototype && nextPrototype.isObject()) {
+ if (UNLIKELY(asObject(nextPrototype)->type() == ProxyObjectType)) {
+ ExecState* exec = globalObject->globalExec();
+ return createTypeError(exec, ASCIILiteral("Proxy is not allowed in the global prototype chain."));
+ }
+ nextPrototype = asObject(nextPrototype)->getPrototypeDirect();
+ }
+
</ins><span class="cx"> JSObject* exception = 0;
</span><span class="cx"> UnlinkedProgramCodeBlock* unlinkedCodeBlock = globalObject->createProgramCodeBlock(callFrame, this, &exception);
</span><span class="cx"> if (exception)
</span><span class="lines">@@ -675,7 +684,7 @@
</span><span class="cx"> RELEASE_ASSERT(offsetForAssert == offset);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ProgramExecutable::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span></span></pre>
</div>
</div>
</body>
</html>