<!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>[202985] 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/202985">202985</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-07-08 10:11:20 -0700 (Fri, 08 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/201805">r201805</a>): Crash with <use> resource that has Vary header
https://bugs.webkit.org/show_bug.cgi?id=159560
<rdar://problem/27034208>
Reviewed by Chris Dumez.
Source/WebCore:
In some situations (SVG <use> element for example) we may try to load resources from frameless documents.
Such loads always fail. The new vary header verification code path tried to access the frame earlier without
null check.
Test: http/tests/cache/vary-frameless-document.html
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::failBeforeStarting):
(WebCore::addAdditionalRequestHeadersToRequest):
Null check frame.
Also move the resource type check here so all callers get the same behavior.
(WebCore::CachedResource::addAdditionalRequestHeaders):
(WebCore::CachedResource::load):
(WebCore::CachedResource::varyHeaderValuesMatch):
LayoutTests:
* http/tests/cache/resources/svg-defs-vary.php: Added.
* http/tests/cache/vary-frameless-document-expected.txt: Added.
* http/tests/cache/vary-frameless-document.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="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestscacheresourcessvgdefsvaryphp">trunk/LayoutTests/http/tests/cache/resources/svg-defs-vary.php</a></li>
<li><a href="#trunkLayoutTestshttptestscachevaryframelessdocumentexpectedtxt">trunk/LayoutTests/http/tests/cache/vary-frameless-document-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestscachevaryframelessdocumenthtml">trunk/LayoutTests/http/tests/cache/vary-frameless-document.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (202984 => 202985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-07-08 17:03:12 UTC (rev 202984)
+++ trunk/LayoutTests/ChangeLog 2016-07-08 17:11:20 UTC (rev 202985)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-07-08 Antti Koivisto <antti@apple.com>
+
+ Regression(r201805): Crash with <use> resource that has Vary header
+ https://bugs.webkit.org/show_bug.cgi?id=159560
+ <rdar://problem/27034208>
+
+ Reviewed by Chris Dumez.
+
+ * http/tests/cache/resources/svg-defs-vary.php: Added.
+ * http/tests/cache/vary-frameless-document-expected.txt: Added.
+ * http/tests/cache/vary-frameless-document.html: Added.
+
</ins><span class="cx"> 2016-07-08 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r202945.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscacheresourcessvgdefsvaryphp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/resources/svg-defs-vary.php (0 => 202985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/resources/svg-defs-vary.php (rev 0)
+++ trunk/LayoutTests/http/tests/cache/resources/svg-defs-vary.php 2016-07-08 17:11:20 UTC (rev 202985)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<?php
+header("Content-Type: image/svg+xml");
+header("Vary: Cookie");
+header("Cache-Control: max-age=31536000");
+?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<g id="circle">
+<circle style="fill:green" r="10"/>
+</g>
+</defs>
+</svg>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachevaryframelessdocumentexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/vary-frameless-document-expected.txt (0 => 202985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/vary-frameless-document-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/cache/vary-frameless-document-expected.txt 2016-07-08 17:11:20 UTC (rev 202985)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if it doesn't crash.
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestscachevaryframelessdocumenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/cache/vary-frameless-document.html (0 => 202985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/vary-frameless-document.html (rev 0)
+++ trunk/LayoutTests/http/tests/cache/vary-frameless-document.html 2016-07-08 17:11:20 UTC (rev 202985)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+var svgDocumentString = '<svg><use x="50" y="10" xlink:href="resources/svg-defs-vary.php#circle" /></svg>';
+function makeDocument() {
+ var doc = document.implementation.createHTMLDocument('');
+ doc.open();
+ doc.write(svgDocumentString);
+ doc.close();
+}
+</script>
+</head>
+<body onload="makeDocument()">
+This test passes if it doesn't crash.
+<script>
+document.write(svgDocumentString);
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202984 => 202985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-08 17:03:12 UTC (rev 202984)
+++ trunk/Source/WebCore/ChangeLog 2016-07-08 17:11:20 UTC (rev 202985)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-07-08 Antti Koivisto <antti@apple.com>
+
+ Regression(r201805): Crash with <use> resource that has Vary header
+ https://bugs.webkit.org/show_bug.cgi?id=159560
+ <rdar://problem/27034208>
+
+ Reviewed by Chris Dumez.
+
+ In some situations (SVG <use> element for example) we may try to load resources from frameless documents.
+ Such loads always fail. The new vary header verification code path tried to access the frame earlier without
+ null check.
+
+ Test: http/tests/cache/vary-frameless-document.html
+
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::failBeforeStarting):
+ (WebCore::addAdditionalRequestHeadersToRequest):
+
+ Null check frame.
+ Also move the resource type check here so all callers get the same behavior.
+
+ (WebCore::CachedResource::addAdditionalRequestHeaders):
+ (WebCore::CachedResource::load):
+ (WebCore::CachedResource::varyHeaderValuesMatch):
+
</ins><span class="cx"> 2016-07-08 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Clearing LocalStorage doesn't also delete -wal and -shm files.
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (202984 => 202985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-07-08 17:03:12 UTC (rev 202984)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-07-08 17:11:20 UTC (rev 202985)
</span><span class="lines">@@ -183,12 +183,18 @@
</span><span class="cx"> error(CachedResource::LoadError);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void addAdditionalRequestHeadersToRequest(ResourceRequest& request, const CachedResourceLoader& cachedResourceLoader)
</del><ins>+static void addAdditionalRequestHeadersToRequest(ResourceRequest& request, const CachedResourceLoader& cachedResourceLoader, CachedResource::Type type)
</ins><span class="cx"> {
</span><ins>+ if (type == CachedResource::MainResource)
+ return;
+ // In some cases we may try to load resources in frameless documents. Such loads always fail.
+ // FIXME: We shouldn't get this far.
+ if (!cachedResourceLoader.frame())
+ return;
+
</ins><span class="cx"> // Note: We skip the Content-Security-Policy check here because we check
</span><span class="cx"> // the Content-Security-Policy at the CachedResourceLoader layer so we can
</span><span class="cx"> // handle different resource types differently.
</span><del>-
</del><span class="cx"> FrameLoader& frameLoader = cachedResourceLoader.frame()->loader();
</span><span class="cx"> String outgoingReferrer;
</span><span class="cx"> String outgoingOrigin;
</span><span class="lines">@@ -213,7 +219,7 @@
</span><span class="cx">
</span><span class="cx"> void CachedResource::addAdditionalRequestHeaders(CachedResourceLoader& cachedResourceLoader)
</span><span class="cx"> {
</span><del>- addAdditionalRequestHeadersToRequest(m_resourceRequest, cachedResourceLoader);
</del><ins>+ addAdditionalRequestHeadersToRequest(m_resourceRequest, cachedResourceLoader, type());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedResource::load(CachedResourceLoader& cachedResourceLoader, const ResourceLoaderOptions& options)
</span><span class="lines">@@ -275,8 +281,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> m_resourceRequest.setPriority(loadPriority());
</span><span class="cx">
</span><del>- if (type() != MainResource)
- addAdditionalRequestHeaders(cachedResourceLoader);
</del><ins>+ addAdditionalRequestHeaders(cachedResourceLoader);
</ins><span class="cx">
</span><span class="cx"> // FIXME: It's unfortunate that the cache layer and below get to know anything about fragment identifiers.
</span><span class="cx"> // We should look into removing the expectation of that knowledge from the platform network stacks.
</span><span class="lines">@@ -780,7 +785,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> ResourceRequest requestWithFullHeaders(request);
</span><del>- addAdditionalRequestHeadersToRequest(requestWithFullHeaders, cachedResourceLoader);
</del><ins>+ addAdditionalRequestHeadersToRequest(requestWithFullHeaders, cachedResourceLoader, type());
</ins><span class="cx">
</span><span class="cx"> return verifyVaryingRequestHeaders(m_varyingHeaderValues, requestWithFullHeaders, m_sessionID);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>