<!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>[206359] trunk</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/206359">206359</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-09-24 23:37:04 -0700 (Sat, 24 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/206221">r206221</a>): [USER] com.apple.WebKit.WebContent.Development at com.apple.JavaScriptCore: vmEntryToJavaScript + 299
https://bugs.webkit.org/show_bug.cgi?id=162536
<rdar://problem/28415971>
Reviewed by Gavin Barraclough.
Source/JavaScriptCore:
Drop API on PropertySlot for setting a cacheable custom getter/setter
given that this is not supported yet and will lead to crashes if used.
* runtime/PropertySlot.h:
(JSC::PropertySlot::isCacheableCustom):
(JSC::PropertySlot::isCacheableCustomAccessor): Deleted.
(JSC::PropertySlot::setCacheableCustomGetterSetter): Deleted.
Source/WebCore:
Stop marking cross-origin Window/Location objects properties as cacheable
given that we do not support yet caching of such properties. This is because
they are using the new CustomAccesstor PropertySlot type, which is not handled
yet by Repatch.cpp. Performance is anyway not critical for cross-origin
Window / Location properties.
Test: http/tests/security/cross-origin-window-property-caching-crash.html
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::jsDOMWindowGetOwnPropertySlotRestrictedAccess):
* bindings/js/JSLocationCustom.cpp:
(WebCore::JSLocation::getOwnPropertySlotDelegate):
LayoutTests:
Add layout test coverage.
* http/tests/security/cross-origin-window-property-caching-crash-expected.txt: Added.
* http/tests/security/cross-origin-window-property-caching-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimePropertySloth">trunk/Source/JavaScriptCore/runtime/PropertySlot.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSLocationCustomcpp">trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginwindowpropertycachingcrashexpectedtxt">trunk/LayoutTests/http/tests/security/cross-origin-window-property-caching-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestssecuritycrossoriginwindowpropertycachingcrashhtml">trunk/LayoutTests/http/tests/security/cross-origin-window-property-caching-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206358 => 206359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-25 05:08:56 UTC (rev 206358)
+++ trunk/LayoutTests/ChangeLog 2016-09-25 06:37:04 UTC (rev 206359)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-09-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r206221): [USER] com.apple.WebKit.WebContent.Development at com.apple.JavaScriptCore: vmEntryToJavaScript + 299
+ https://bugs.webkit.org/show_bug.cgi?id=162536
+ <rdar://problem/28415971>
+
+ Reviewed by Gavin Barraclough.
+
+ Add layout test coverage.
+
+ * http/tests/security/cross-origin-window-property-caching-crash-expected.txt: Added.
+ * http/tests/security/cross-origin-window-property-caching-crash.html: Added.
+
+2016-09-24 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> REGRESSION (r205524): Crash under WTF::numGraphemeClusters()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162534
</span><span class="cx"> <rdar://problem/28463828>
</span></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossoriginwindowpropertycachingcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cross-origin-window-property-caching-crash-expected.txt (0 => 206359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-window-property-caching-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/security/cross-origin-window-property-caching-crash-expected.txt 2016-09-25 06:37:04 UTC (rev 206359)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+Test that we do not crash when repeatedly accessing properties of a cross-origin Window.
+
+This test passes if it does not crash
+
+
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestssecuritycrossoriginwindowpropertycachingcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/security/cross-origin-window-property-caching-crash.html (0 => 206359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/security/cross-origin-window-property-caching-crash.html (rev 0)
+++ trunk/LayoutTests/http/tests/security/cross-origin-window-property-caching-crash.html 2016-09-25 06:37:04 UTC (rev 206359)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>Test that we do not crash when repeatedly accessing properties of a cross-origin Window.</p>
+<p>This test passes if it does not crash</p>
+<iframe src="http://localhost:8000/security/resources/empty.html"></iframe><br>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+onload = function() {
+ var i = 0;
+ var iterations = 100000;
+ var crossOriginWindow = frames[0];
+ for (var i = 0; i < iterations; i++) {
+ i += crossOriginWindow.closed;
+ }
+ if (i == iterations)
+ document.body.appendChild(document.createTextNode("PASS"));
+ else
+ document.body.appendChild(document.createTextNode("FAIL"));
+}
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (206358 => 206359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-09-25 05:08:56 UTC (rev 206358)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-09-25 06:37:04 UTC (rev 206359)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-09-24 Chris Dumez <cdumez@apple.com>
+
+ REGRESSION (r206221): [USER] com.apple.WebKit.WebContent.Development at com.apple.JavaScriptCore: vmEntryToJavaScript + 299
+ https://bugs.webkit.org/show_bug.cgi?id=162536
+ <rdar://problem/28415971>
+
+ Reviewed by Gavin Barraclough.
+
+ Drop API on PropertySlot for setting a cacheable custom getter/setter
+ given that this is not supported yet and will lead to crashes if used.
+
+ * runtime/PropertySlot.h:
+ (JSC::PropertySlot::isCacheableCustom):
+ (JSC::PropertySlot::isCacheableCustomAccessor): Deleted.
+ (JSC::PropertySlot::setCacheableCustomGetterSetter): Deleted.
+
</ins><span class="cx"> 2016-09-23 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Need a store-load fence between setting cell state and visiting the object in SlotVisitor
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimePropertySloth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/PropertySlot.h (206358 => 206359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/PropertySlot.h 2016-09-25 05:08:56 UTC (rev 206358)
+++ trunk/Source/JavaScriptCore/runtime/PropertySlot.h 2016-09-25 06:37:04 UTC (rev 206359)
</span><span class="lines">@@ -112,7 +112,6 @@
</span><span class="cx"> bool isCacheableValue() const { return isCacheable() && isValue(); }
</span><span class="cx"> bool isCacheableGetter() const { return isCacheable() && isAccessor(); }
</span><span class="cx"> bool isCacheableCustom() const { return isCacheable() && isCustom(); }
</span><del>- bool isCacheableCustomAccessor() const { return isCacheable() && isCustomAccessor(); }
</del><span class="cx"> void setIsTaintedByOpaqueObject() { m_isTaintedByOpaqueObject = true; }
</span><span class="cx"> bool isTaintedByOpaqueObject() const { return m_isTaintedByOpaqueObject; }
</span><span class="cx">
</span><span class="lines">@@ -241,20 +240,6 @@
</span><span class="cx"> m_offset = invalidOffset;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void setCacheableCustomGetterSetter(JSObject* slotBase, unsigned attributes, CustomGetterSetter* getterSetter)
- {
- ASSERT(attributes == attributesForStructure(attributes));
-
- ASSERT(getterSetter);
- m_data.customAccessor.getterSetter = getterSetter;
- m_attributes = attributes;
-
- ASSERT(slotBase);
- m_slotBase = slotBase;
- m_propertyType = TypeCustomAccessor;
- m_offset = !invalidOffset;
- }
-
</del><span class="cx"> void setGetterSlot(JSObject* slotBase, unsigned attributes, GetterSetter* getterSetter)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(attributes == attributesForStructure(attributes));
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206358 => 206359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-25 05:08:56 UTC (rev 206358)
+++ trunk/Source/WebCore/ChangeLog 2016-09-25 06:37:04 UTC (rev 206359)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-09-24 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION (r206221): [USER] com.apple.WebKit.WebContent.Development at com.apple.JavaScriptCore: vmEntryToJavaScript + 299
+ https://bugs.webkit.org/show_bug.cgi?id=162536
+ <rdar://problem/28415971>
+
+ Reviewed by Gavin Barraclough.
+
+ Stop marking cross-origin Window/Location objects properties as cacheable
+ given that we do not support yet caching of such properties. This is because
+ they are using the new CustomAccesstor PropertySlot type, which is not handled
+ yet by Repatch.cpp. Performance is anyway not critical for cross-origin
+ Window / Location properties.
+
+ Test: http/tests/security/cross-origin-window-property-caching-crash.html
+
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::jsDOMWindowGetOwnPropertySlotRestrictedAccess):
+ * bindings/js/JSLocationCustom.cpp:
+ (WebCore::JSLocation::getOwnPropertySlotDelegate):
+
+2016-09-24 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> REGRESSION (r205524): Crash under WTF::numGraphemeClusters()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162534
</span><span class="cx"> <rdar://problem/28463828>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (206358 => 206359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-09-25 05:08:56 UTC (rev 206358)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-09-25 06:37:04 UTC (rev 206359)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> || propertyName == exec->propertyNames().top) {
</span><span class="cx"> bool shouldExposeSetter = propertyName == exec->propertyNames().location;
</span><span class="cx"> CustomGetterSetter* customGetterSetter = CustomGetterSetter::create(vm, entry->propertyGetter(), shouldExposeSetter ? entry->propertyPutter() : nullptr);
</span><del>- slot.setCacheableCustomGetterSetter(thisObject, DontEnum | CustomAccessor, customGetterSetter);
</del><ins>+ slot.setCustomGetterSetter(thisObject, DontEnum | CustomAccessor, customGetterSetter);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSLocationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp (206358 => 206359)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2016-09-25 05:08:56 UTC (rev 206358)
+++ trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp 2016-09-25 06:37:04 UTC (rev 206359)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> if (slot.internalMethodType() == PropertySlot::InternalMethodType::GetOwnProperty && propertyName == exec->propertyNames().href) {
</span><span class="cx"> auto* entry = JSLocation::info()->staticPropHashTable->entry(propertyName);
</span><span class="cx"> CustomGetterSetter* customGetterSetter = CustomGetterSetter::create(vm, nullptr, entry->propertyPutter());
</span><del>- slot.setCacheableCustomGetterSetter(this, DontEnum | CustomAccessor, customGetterSetter);
</del><ins>+ slot.setCustomGetterSetter(this, DontEnum | CustomAccessor, customGetterSetter);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>