<!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>[198080] 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/198080">198080</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2016-03-13 08:46:50 -0700 (Sun, 13 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>http://kangax.github.io/compat-table/esnext/ crashes reliably.
https://bugs.webkit.org/show_bug.cgi?id=155404
Reviewed by Yusuke Suzuki.
constructObjectFromPropertyDescriptor() was incorrectly assuming that either
both getter and setter will be set or unset. It did not consider that only one
of the getter or setter may be set. This patch fixes that.
* runtime/ObjectConstructor.h:
(JSC::constructObjectFromPropertyDescriptor):
* tests/stress/proxy-with-unbalanced-getter-setter.js: Added.
(assert):
(let.handler.defineProperty):
(i.):
(i.assert):
(i.get assert):
(set assert):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeObjectConstructorh">trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressproxywithunbalancedgettersetterjs">trunk/Source/JavaScriptCore/tests/stress/proxy-with-unbalanced-getter-setter.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (198079 => 198080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-03-13 14:46:35 UTC (rev 198079)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-03-13 15:46:50 UTC (rev 198080)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-03-12 Mark Lam <mark.lam@apple.com>
+
+ http://kangax.github.io/compat-table/esnext/ crashes reliably.
+ https://bugs.webkit.org/show_bug.cgi?id=155404
+
+ Reviewed by Yusuke Suzuki.
+
+ constructObjectFromPropertyDescriptor() was incorrectly assuming that either
+ both getter and setter will be set or unset. It did not consider that only one
+ of the getter or setter may be set. This patch fixes that.
+
+ * runtime/ObjectConstructor.h:
+ (JSC::constructObjectFromPropertyDescriptor):
+ * tests/stress/proxy-with-unbalanced-getter-setter.js: Added.
+ (assert):
+ (let.handler.defineProperty):
+ (i.):
+ (i.assert):
+ (i.get assert):
+ (set assert):
+
</ins><span class="cx"> 2016-03-12 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> When generating Objective-C protocol types, getters for objects need to synthesize a new object instance
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeObjectConstructorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h (198079 => 198080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h 2016-03-13 14:46:35 UTC (rev 198079)
+++ trunk/Source/JavaScriptCore/runtime/ObjectConstructor.h 2016-03-13 15:46:50 UTC (rev 198080)
</span><span class="lines">@@ -104,10 +104,11 @@
</span><span class="cx"> description->putDirect(vm, vm.propertyNames->value, descriptor.value() ? descriptor.value() : jsUndefined(), 0);
</span><span class="cx"> description->putDirect(vm, vm.propertyNames->writable, jsBoolean(descriptor.writable()), 0);
</span><span class="cx"> } else {
</span><del>- ASSERT(descriptor.getter());
- ASSERT(descriptor.setter());
- description->putDirect(vm, vm.propertyNames->get, descriptor.getter(), 0);
- description->putDirect(vm, vm.propertyNames->set, descriptor.setter(), 0);
</del><ins>+ ASSERT(descriptor.getter() || descriptor.setter());
+ if (descriptor.getter())
+ description->putDirect(vm, vm.propertyNames->get, descriptor.getter(), 0);
+ if (descriptor.setter())
+ description->putDirect(vm, vm.propertyNames->set, descriptor.setter(), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> description->putDirect(vm, vm.propertyNames->enumerable, jsBoolean(descriptor.enumerable()), 0);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressproxywithunbalancedgettersetterjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/proxy-with-unbalanced-getter-setter.js (0 => 198080)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/proxy-with-unbalanced-getter-setter.js (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/proxy-with-unbalanced-getter-setter.js 2016-03-13 15:46:50 UTC (rev 198080)
</span><span class="lines">@@ -0,0 +1,70 @@
</span><ins>+function assert(b) {
+ if (!b)
+ throw new Error("Bad assertion.");
+}
+
+// Setting the getter only.
+(function () {
+ let target = {};
+ let called = false;
+ let handler = {
+ defineProperty: function(theTarget, propName, descriptor) {
+ called = true;
+ return Reflect.defineProperty(theTarget, propName, descriptor);
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let result = Reflect.defineProperty(proxy, "x", {
+ enumerable: true,
+ configurable: true,
+ get: function(){},
+ });
+ assert(result);
+ assert(called);
+ called = false;
+
+ for (let obj of [target, proxy]) {
+ let pDesc = Object.getOwnPropertyDescriptor(obj, "x");
+ assert(typeof pDesc.get === "function");
+ assert(typeof pDesc.set === "undefined");
+ assert(pDesc.get.toString() === (function(){}).toString());
+ assert(pDesc.configurable === true);
+ assert(pDesc.enumerable === true);
+ }
+ }
+})();
+
+// Setting the setter only.
+(function () {
+ let target = {};
+ let called = false;
+ let handler = {
+ defineProperty: function(theTarget, propName, descriptor) {
+ called = true;
+ return Reflect.defineProperty(theTarget, propName, descriptor);
+ }
+ };
+
+ let proxy = new Proxy(target, handler);
+ for (let i = 0; i < 500; i++) {
+ let result = Reflect.defineProperty(proxy, "x", {
+ enumerable: true,
+ configurable: true,
+ set: function(x){},
+ });
+ assert(result);
+ assert(called);
+ called = false;
+
+ for (let obj of [target, proxy]) {
+ let pDesc = Object.getOwnPropertyDescriptor(obj, "x");
+ assert(typeof pDesc.get === "undefined");
+ assert(typeof pDesc.set === "function");
+ assert(pDesc.set.toString() === (function(x){}).toString());
+ assert(pDesc.configurable === true);
+ assert(pDesc.enumerable === true);
+ }
+ }
+})();
</ins></span></pre>
</div>
</div>
</body>
</html>