<!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>[184098] releases/WebKitGTK/webkit-2.8</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/184098">184098</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 08:08:28 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183275">r183275</a> - Made Object.prototype.__proto__ native getter and setter check that this object not null or undefined
https://bugs.webkit.org/show_bug.cgi?id=141865
rdar://problem/19927273
Reviewed by Filip Pizlo.
* runtime/JSGlobalObjectFunctions.cpp:
(JSC::globalFuncProtoGetter):
(JSC::globalFuncProtoSetter):
LayoutTests:
Added tests to ensure that Object.prototype.__proto__ native getter and setter do not coerce undefined to this
https://bugs.webkit.org/show_bug.cgi?id=141865
rdar://problem/19927273
Reviewed by Filip Pizlo.
* js/script-tests/sloppy-getter-setter-global-object.js: Added.
* js/sloppy-getter-setter-global-object-expected.txt: Added.
* js/sloppy-getter-setter-global-object.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp">releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsjsscripttestssloppygettersetterglobalobjectjs">releases/WebKitGTK/webkit-2.8/LayoutTests/js/script-tests/sloppy-getter-setter-global-object.js</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsjssloppygettersetterglobalobjectexpectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/js/sloppy-getter-setter-global-object-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsjssloppygettersetterglobalobjecthtml">releases/WebKitGTK/webkit-2.8/LayoutTests/js/sloppy-getter-setter-global-object.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (184097 => 184098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-05-11 15:08:00 UTC (rev 184097)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-05-11 15:08:28 UTC (rev 184098)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-24 Matthew Mirman <mmirman@apple.com>
+
+ Added tests to ensure that Object.prototype.__proto__ native getter and setter do not coerce undefined to this
+ https://bugs.webkit.org/show_bug.cgi?id=141865
+ rdar://problem/19927273
+
+ Reviewed by Filip Pizlo.
+
+ * js/script-tests/sloppy-getter-setter-global-object.js: Added.
+ * js/sloppy-getter-setter-global-object-expected.txt: Added.
+ * js/sloppy-getter-setter-global-object.html: Added.
+
</ins><span class="cx"> 2015-04-21 Jinwoo Song <jinwoo7.song@samsung.com>
</span><span class="cx">
</span><span class="cx"> [Cairo] Implement Path::addPath
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsjsscripttestssloppygettersetterglobalobjectjs"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/js/script-tests/sloppy-getter-setter-global-object.js (0 => 184098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/js/script-tests/sloppy-getter-setter-global-object.js (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/js/script-tests/sloppy-getter-setter-global-object.js 2015-05-11 15:08:28 UTC (rev 184098)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+description(
+"Tests that check that sloppy getters and setters on the global object don't coerce undefined to their this."
+);
+
+var act_e = undefined;
+try {
+ this.__proto__;
+ var originalProto = this.__proto__;
+ this.__proto__ = 1;
+ if (this.__proto__ != originalProto)
+ throw "__proto__ was modified";
+} catch (e) {
+ act_e = e;
+}
+
+if (act_e)
+ testFailed("shouldn't have thrown '"+ e + "' when accessing and modifying this.__proto__");
+else
+ testPassed("this.__proto__ accessed succesfully and stayed frozen.");
+
+shouldNotThrow("Object.prototype.valueOf.call(3);");
+shouldThrow("Object.prototype.valueOf.call(null);");
+
+
+shouldNotThrow("Object.getOwnPropertyDescriptor(Object.prototype,'__proto__').get()");
+shouldNotThrow("Object.getOwnPropertyDescriptor(Object.prototype,'__proto__').set(['foo'])");
+
+shouldThrow("(0,Object.getOwnPropertyDescriptor(Object.prototype,'__proto__').get)()", "\"TypeError: Can't convert undefined or null to object\"");
+shouldThrow("(0,Object.getOwnPropertyDescriptor(Object.prototype,'__proto__').set)(['foo'])", "\"TypeError: Can't convert undefined or null to object\"");
+
+
+var top_level_sloppy_getter = Object.getOwnPropertyDescriptor(Object.prototype,'__proto__').get;
+shouldNotThrow("top_level_sloppy_getter();");
+
+var top_level_sloppy_setter = Object.getOwnPropertyDescriptor(Object.prototype,'__proto__').set;
+shouldNotThrow("top_level_sloppy_setter(['foo']);");
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsjssloppygettersetterglobalobjectexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/js/sloppy-getter-setter-global-object-expected.txt (0 => 184098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/js/sloppy-getter-setter-global-object-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/js/sloppy-getter-setter-global-object-expected.txt 2015-05-11 15:08:28 UTC (rev 184098)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+Tests that check that sloppy getters and setters on the global object don't coerce undefined to their this.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS this.__proto__ accessed succesfully and stayed frozen.
+PASS Object.prototype.valueOf.call(3); did not throw exception.
+PASS Object.prototype.valueOf.call(null); threw exception TypeError: null is not an object (evaluating 'Object.prototype.valueOf.call(null)').
+PASS Object.getOwnPropertyDescriptor(Object.prototype,'__proto__').get() did not throw exception.
+PASS Object.getOwnPropertyDescriptor(Object.prototype,'__proto__').set(['foo']) did not throw exception.
+PASS (0,Object.getOwnPropertyDescriptor(Object.prototype,'__proto__').get)() threw exception TypeError: Can't convert undefined or null to object.
+PASS (0,Object.getOwnPropertyDescriptor(Object.prototype,'__proto__').set)(['foo']) threw exception TypeError: Can't convert undefined or null to object.
+PASS top_level_sloppy_getter(); did not throw exception.
+PASS top_level_sloppy_setter(['foo']); did not throw exception.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsjssloppygettersetterglobalobjecthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/js/sloppy-getter-setter-global-object.html (0 => 184098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/js/sloppy-getter-setter-global-object.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/js/sloppy-getter-setter-global-object.html 2015-05-11 15:08:28 UTC (rev 184098)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script src="script-tests/sloppy-getter-setter-global-object.js"></script>
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog (184097 => 184098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog 2015-05-11 15:08:00 UTC (rev 184097)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/ChangeLog 2015-05-11 15:08:28 UTC (rev 184098)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-24 Matthew Mirman <mmirman@apple.com>
+
+ Made Object.prototype.__proto__ native getter and setter check that this object not null or undefined
+ https://bugs.webkit.org/show_bug.cgi?id=141865
+ rdar://problem/19927273
+
+ Reviewed by Filip Pizlo.
+
+ * runtime/JSGlobalObjectFunctions.cpp:
+ (JSC::globalFuncProtoGetter):
+ (JSC::globalFuncProtoSetter):
+
</ins><span class="cx"> 2015-04-15 Jordan Harband <ljharb@gmail.com>
</span><span class="cx">
</span><span class="cx"> String.prototype.startsWith/endsWith/includes have wrong length in r182673
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceJavaScriptCoreruntimeJSGlobalObjectFunctionscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp (184097 => 184098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-05-11 15:08:00 UTC (rev 184097)
+++ releases/WebKitGTK/webkit-2.8/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp 2015-05-11 15:08:28 UTC (rev 184098)
</span><span class="lines">@@ -740,6 +740,9 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncProtoGetter(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ if (exec->thisValue().isUndefinedOrNull())
+ return throwVMError(exec, createTypeError(exec, "Can't convert undefined or null to object"));
+
</ins><span class="cx"> JSObject* thisObject = jsDynamicCast<JSObject*>(exec->thisValue().toThis(exec, NotStrictMode));
</span><span class="cx">
</span><span class="cx"> if (!thisObject)
</span><span class="lines">@@ -780,6 +783,9 @@
</span><span class="cx">
</span><span class="cx"> EncodedJSValue JSC_HOST_CALL globalFuncProtoSetter(ExecState* exec)
</span><span class="cx"> {
</span><ins>+ if (exec->thisValue().isUndefinedOrNull())
+ return throwVMError(exec, createTypeError(exec, "Can't convert undefined or null to object"));
+
</ins><span class="cx"> JSValue value = exec->argument(0);
</span><span class="cx">
</span><span class="cx"> JSObject* thisObject = jsDynamicCast<JSObject*>(exec->thisValue().toThis(exec, NotStrictMode));
</span></span></pre>
</div>
</div>
</body>
</html>