<!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>[166090] 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/166090">166090</a></dd>
<dt>Author</dt> <dd>oliver@apple.com</dd>
<dt>Date</dt> <dd>2014-03-21 12:12:40 -0700 (Fri, 21 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: Fix a crash when assigning an object to document.location
https://bugs.webkit.org/show_bug.cgi?id=130213
Reviewed by Geoffrey Garen.
Convert location to string before we make use the document.
This prevents us from attempting to navigate a frame that
has already been removed.
Test: fast/dom/navigation-with-sideeffects-crash.html
* bindings/js/JSDocumentCustom.cpp:
(WebCore::JSDocument::location):
(WebCore::JSDocument::setLocation):
LayoutTests: Fix semantics of JS execution when assigning an object to document.location
https://bugs.webkit.org/show_bug.cgi?id=130213
Reviewed by Geoffrey Garen.
* fast/dom/navigation-with-sideeffects-expected.txt: Added.
* fast/dom/navigation-with-sideeffects.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="#trunkSourceWebCorebindingsjsJSDocumentCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomnavigationwithsideeffectsexpectedtxt">trunk/LayoutTests/fast/dom/navigation-with-sideeffects-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomnavigationwithsideeffectshtml">trunk/LayoutTests/fast/dom/navigation-with-sideeffects.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166089 => 166090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-21 19:10:00 UTC (rev 166089)
+++ trunk/LayoutTests/ChangeLog 2014-03-21 19:12:40 UTC (rev 166090)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-21 Oliver Hunt <oliver@apple.com>
+
+ Fix semantics of JS execution when assigning an object to document.location
+ https://bugs.webkit.org/show_bug.cgi?id=130213
+
+ Reviewed by Geoffrey Garen.
+
+ * fast/dom/navigation-with-sideeffects-expected.txt: Added.
+ * fast/dom/navigation-with-sideeffects.html: Added.
+
</ins><span class="cx"> 2014-03-21 Adenilson Cavalcanti <cavalcantii@gmail.com>
</span><span class="cx">
</span><span class="cx"> Refactor css3/filters/huge-region test
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomnavigationwithsideeffectsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/navigation-with-sideeffects-expected.txt (0 => 166090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/navigation-with-sideeffects-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/navigation-with-sideeffects-expected.txt 2014-03-21 19:12:40 UTC (rev 166090)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+ALERT: completed o1.toString()
+ALERT: completed o2.toString
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomnavigationwithsideeffectshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/navigation-with-sideeffects.html (0 => 166090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/navigation-with-sideeffects.html (rev 0)
+++ trunk/LayoutTests/fast/dom/navigation-with-sideeffects.html 2014-03-21 19:12:40 UTC (rev 166090)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<html>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+var i = 0;
+function test() {
+ try {
+ o1 = {
+ toString : function () {
+ i++;
+ if (i<50)
+ document.getElementById("testFrame").contentDocument.location = o1;
+ else
+ alert("completed o1.toString()");
+ document.open();
+ return "data:text/plain,o1-" + i;
+ }
+ }
+ o2 = {
+ get toString() {
+ i++;
+ if (i<50)
+ document.getElementById("testFrame").contentDocument.location = o2
+ else
+ alert("completed o2.toString");
+ document.open();
+ return function(){ return "data:text/plain,o2-" + i; }
+ }
+ }
+
+ tmp = document.getElementById("testFrame");
+ i = 0;
+ tmp.contentDocument.location = o1;
+ document.write("<iframe src='about:blank' id='testFrame'/>");
+ tmp = document.getElementById("testFrame");
+ i = 0;
+ tmp.contentDocument.location = o2;
+ } finally {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+}
+</script>
+<body id="log" onload="test()">
+<iframe src="about:blank" id="testFrame"/>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166089 => 166090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-21 19:10:00 UTC (rev 166089)
+++ trunk/Source/WebCore/ChangeLog 2014-03-21 19:12:40 UTC (rev 166090)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-03-21 Oliver Hunt <oliver@apple.com>
+
+ Fix a crash when assigning an object to document.location
+ https://bugs.webkit.org/show_bug.cgi?id=130213
+
+ Reviewed by Geoffrey Garen.
+
+ Convert location to string before we make use the document.
+ This prevents us from attempting to navigate a frame that
+ has already been removed.
+
+ Test: fast/dom/navigation-with-sideeffects-crash.html
+
+ * bindings/js/JSDocumentCustom.cpp:
+ (WebCore::JSDocument::location):
+ (WebCore::JSDocument::setLocation):
+
</ins><span class="cx"> 2014-03-21 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Replay: replay controller is improperly setting user input bridge state
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp (166089 => 166090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2014-03-21 19:10:00 UTC (rev 166089)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.cpp 2014-03-21 19:12:40 UTC (rev 166090)
</span><span class="lines">@@ -48,30 +48,30 @@
</span><span class="cx">
</span><span class="cx"> JSValue JSDocument::location(ExecState* exec) const
</span><span class="cx"> {
</span><del>- Frame* frame = impl().frame();
</del><ins>+ RefPtr<Frame> frame = impl().frame();
</ins><span class="cx"> if (!frame)
</span><span class="cx"> return jsNull();
</span><span class="cx">
</span><del>- Location* location = frame->document()->domWindow()->location();
- if (JSObject* wrapper = getCachedWrapper(globalObject()->world(), location))
</del><ins>+ RefPtr<Location> location = frame->document()->domWindow()->location();
+ if (JSObject* wrapper = getCachedWrapper(globalObject()->world(), location.get()))
</ins><span class="cx"> return wrapper;
</span><span class="cx">
</span><del>- JSLocation* jsLocation = JSLocation::create(getDOMStructure<JSLocation>(exec->vm(), globalObject()), globalObject(), location);
- cacheWrapper(globalObject()->world(), location, jsLocation);
</del><ins>+ JSLocation* jsLocation = JSLocation::create(getDOMStructure<JSLocation>(exec->vm(), globalObject()), globalObject(), location.get());
+ cacheWrapper(globalObject()->world(), location.get(), jsLocation);
</ins><span class="cx"> return jsLocation;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSDocument::setLocation(ExecState* exec, JSValue value)
</span><span class="cx"> {
</span><del>- Frame* frame = impl().frame();
- if (!frame)
- return;
-
</del><span class="cx"> String locationString = value.toString(exec)->value(exec);
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (Location* location = frame->document()->domWindow()->location())
</del><ins>+ RefPtr<Frame> frame = impl().frame();
+ if (!frame)
+ return;
+
+ if (RefPtr<Location> location = frame->document()->domWindow()->location())
</ins><span class="cx"> location->setHref(locationString, activeDOMWindow(exec), firstDOMWindow(exec));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>