<!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>[194399] 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/194399">194399</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-12-23 15:31:44 -0800 (Wed, 23 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore:
Avoids stack recursion when indexed propertyNames defined using Object.defineProperty are deleted.
https://bugs.webkit.org/show_bug.cgi?id=149179
<rdar://problem/22708019>.
Patch by Pranjal Jumde <pjumde@apple.com> on 2015-12-23
Reviewed by Filip Pizlo.
* runtime/JSObject.cpp:
(JSStorage::deletePropertyByIndex was invoking Base::deleteProperty for indexed propertyNames instead of Base::deletePropertyByIndex leading to a stack recursion)
LayoutTests:
Test to check for stack recursion when indexed propertyNames defined using Object.defineProperty are deleted.
https://bugs.webkit.org/show_bug.cgi?id=149179
<rdar://problem/22708019>.
Patch by Pranjal Jumde <pjumde@apple.com> on 2015-12-23
Reviewed by Filip Pizlo.
* storage/domstorage/localstorage/delete-defineproperty-removal-expected.txt: Added.
* storage/domstorage/localstorage/delete-defineproperty-removal.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSStorageCustomcpp">trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsstoragedomstoragelocalstoragedeletedefinepropertyremovalexpectedtxt">trunk/LayoutTests/storage/domstorage/localstorage/delete-defineproperty-removal-expected.txt</a></li>
<li><a href="#trunkLayoutTestsstoragedomstoragelocalstoragedeletedefinepropertyremovalhtml">trunk/LayoutTests/storage/domstorage/localstorage/delete-defineproperty-removal.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194398 => 194399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-23 23:25:28 UTC (rev 194398)
+++ trunk/LayoutTests/ChangeLog 2015-12-23 23:31:44 UTC (rev 194399)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-12-23 Pranjal Jumde <pjumde@apple.com>
+
+ Test to check for stack recursion when indexed propertyNames defined using Object.defineProperty are deleted.
+ https://bugs.webkit.org/show_bug.cgi?id=149179
+ <rdar://problem/22708019>.
+
+ Reviewed by Filip Pizlo.
+
+ * storage/domstorage/localstorage/delete-defineproperty-removal-expected.txt: Added.
+ * storage/domstorage/localstorage/delete-defineproperty-removal.html: Added.
+
</ins><span class="cx"> 2015-12-23 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] MediaDeviceInfo.label must be empty in some situations
</span></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragelocalstoragedeletedefinepropertyremovalexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/domstorage/localstorage/delete-defineproperty-removal-expected.txt (0 => 194399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/localstorage/delete-defineproperty-removal-expected.txt (rev 0)
+++ trunk/LayoutTests/storage/domstorage/localstorage/delete-defineproperty-removal-expected.txt 2015-12-23 23:31:44 UTC (rev 194399)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+CONSOLE MESSAGE: line 12: constructor,length
+CONSOLE MESSAGE: line 15: 1,constructor,length
+CONSOLE MESSAGE: line 18: 1,constructor,length
+CONSOLE MESSAGE: line 21: 1,2,constructor,length
+CONSOLE MESSAGE: line 24: 1,constructor,length
+CONSOLE MESSAGE: line 27: 1,constructor,length,Test
+CONSOLE MESSAGE: line 30: 1,constructor,length
+CONSOLE MESSAGE: line 33: 1,constructor,length,Test1
+CONSOLE MESSAGE: line 36: 1,constructor,length,Test1
</ins></span></pre></div>
<a id="trunkLayoutTestsstoragedomstoragelocalstoragedeletedefinepropertyremovalhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/storage/domstorage/localstorage/delete-defineproperty-removal.html (0 => 194399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/storage/domstorage/localstorage/delete-defineproperty-removal.html (rev 0)
+++ trunk/LayoutTests/storage/domstorage/localstorage/delete-defineproperty-removal.html 2015-12-23 23:31:44 UTC (rev 194399)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<script>
+function runTest() {
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ if (!window.localStorage) {
+ console.log("window.localStorage DOES NOT exist");
+ return;
+ }
+
+ localStorage.clear();
+ console.log(Object.getOwnPropertyNames(localStorage));
+
+ Object.defineProperty(localStorage, "1", {value: "present"});
+ console.log(Object.getOwnPropertyNames(localStorage));
+
+ delete localStorage[1];
+ console.log(Object.getOwnPropertyNames(localStorage));
+
+ Object.defineProperty(localStorage, "2", {value: "present", configurable: true});
+ console.log(Object.getOwnPropertyNames(localStorage));
+
+ delete localStorage[2];
+ console.log(Object.getOwnPropertyNames(localStorage));
+
+ Object.defineProperty(localStorage, "Test", {value: "present", configurable: true});
+ console.log(Object.getOwnPropertyNames(localStorage));
+
+ delete localStorage["Test"];
+ console.log(Object.getOwnPropertyNames(localStorage));
+
+ Object.defineProperty(localStorage, "Test1", {value: "present"});
+ console.log(Object.getOwnPropertyNames(localStorage));
+
+ delete localStorage["Test1"];
+ console.log(Object.getOwnPropertyNames(localStorage));
+
+}
+</script>
+<body onload="runTest();">
+</body>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194398 => 194399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-23 23:25:28 UTC (rev 194398)
+++ trunk/Source/WebCore/ChangeLog 2015-12-23 23:31:44 UTC (rev 194399)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-12-23 Pranjal Jumde <pjumde@apple.com>
+
+ Avoids stack recursion when indexed propertyNames defined using Object.defineProperty are deleted.
+ https://bugs.webkit.org/show_bug.cgi?id=149179
+ <rdar://problem/22708019>.
+
+ Reviewed by Filip Pizlo.
+
+ * runtime/JSObject.cpp:
+ (JSStorage::deletePropertyByIndex was invoking Base::deleteProperty for indexed propertyNames instead of Base::deletePropertyByIndex leading to a stack recursion)
+
</ins><span class="cx"> 2015-12-23 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] MediaDeviceInfo.label must be empty in some situations
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSStorageCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp (194398 => 194399)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp 2015-12-23 23:25:28 UTC (rev 194398)
+++ trunk/Source/WebCore/bindings/js/JSStorageCustom.cpp 2015-12-23 23:31:44 UTC (rev 194399)
</span><span class="lines">@@ -58,9 +58,11 @@
</span><span class="cx"> // Since hasProperty() would end up calling canGetItemsForName() and be fooled, we need to check
</span><span class="cx"> // the native property slots manually.
</span><span class="cx"> PropertySlot slot(thisObject);
</span><del>- if (getStaticValueSlot<JSStorage, Base>(exec, *s_info.staticPropHashTable, thisObject, propertyName, slot))
</del><ins>+ if (getStaticValueSlot<JSStorage, Base>(exec, *s_info.staticPropHashTable, thisObject, propertyName, slot)) {
+ if (Optional<uint32_t> index = parseIndex(propertyName))
+ return Base::deletePropertyByIndex(thisObject, exec, index.value());
</ins><span class="cx"> return Base::deleteProperty(thisObject, exec, propertyName);
</span><del>-
</del><ins>+ }
</ins><span class="cx"> JSValue prototype = thisObject->prototype();
</span><span class="cx"> if (prototype.isObject() && asObject(prototype)->getPropertySlot(exec, propertyName, slot))
</span><span class="cx"> return Base::deleteProperty(thisObject, exec, propertyName);
</span><span class="lines">@@ -76,6 +78,10 @@
</span><span class="cx">
</span><span class="cx"> bool JSStorage::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)
</span><span class="cx"> {
</span><ins>+ JSStorage* thisObject = jsCast<JSStorage*>(cell);
+ PropertySlot slot(thisObject);
+ if (getStaticValueSlot<JSStorage, Base>(exec, *s_info.staticPropHashTable, thisObject, Identifier::from(exec, propertyName), slot))
+ return Base::deletePropertyByIndex(thisObject, exec, propertyName);
</ins><span class="cx"> return deleteProperty(cell, exec, Identifier::from(exec, propertyName));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>