<!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>[178937] 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/178937">178937</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-01-22 13:04:39 -0800 (Thu, 22 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in URL::protocol() after appcache load fails
https://bugs.webkit.org/show_bug.cgi?id=140755
rdar://problem/7881290
Reviewed by Dan Bates.
Source/WebCore:
Test: http/tests/appcache/404-resource-with-slow-main-resource.php
Not every cache that isn't being updated is complete. It could also be in a zombie
state after failing to load. We get rid of the cache once the main resource finishes
loading, but while it's being loaded, the zombie still looks like a regular
candidate application cache.
* loader/appcache/ApplicationCache.cpp: (WebCore::ApplicationCache::isComplete):
* loader/appcache/ApplicationCache.h:
Removed const from isComplete(), because otherwise we couldn't use ApplicationCacheGroup::m_caches.contains().
Constness doesn't make a lot of sense for these objects anyway.
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::failedLoadingMainResource): Toned down an assertion.
We can fail a main resource load when the document has a zombie appcache, too.
* loader/appcache/ApplicationCacheGroup.h:
(WebCore::ApplicationCacheGroup::cacheIsComplete):
(WebCore::ApplicationCacheGroup::cacheIsBeingUpdated): Deleted.
These functions are only used in ApplicationCache::isComplete().
LayoutTests:
* http/tests/appcache/404-resource-with-slow-main-resource-expected.txt: Added.
* http/tests/appcache/404-resource-with-slow-main-resource.php: 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="#trunkSourceWebCoreloaderappcacheApplicationCachecpp">trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheh">trunk/Source/WebCore/loader/appcache/ApplicationCache.h</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGrouph">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsappcache404resourcewithslowmainresourceexpectedtxt">trunk/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsappcache404resourcewithslowmainresourcephp">trunk/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (178936 => 178937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-22 20:35:02 UTC (rev 178936)
+++ trunk/LayoutTests/ChangeLog 2015-01-22 21:04:39 UTC (rev 178937)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-01-22 Alexey Proskuryakov <ap@apple.com>
+
+ Crash in URL::protocol() after appcache load fails
+ https://bugs.webkit.org/show_bug.cgi?id=140755
+ rdar://problem/7881290
+
+ Reviewed by Dan Bates.
+
+ * http/tests/appcache/404-resource-with-slow-main-resource-expected.txt: Added.
+ * http/tests/appcache/404-resource-with-slow-main-resource.php: Added.
+
</ins><span class="cx"> 2015-01-22 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r178894.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcache404resourcewithslowmainresourceexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource-expected.txt (0 => 178937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource-expected.txt 2015-01-22 21:04:39 UTC (rev 178937)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+CONSOLE MESSAGE: Application Cache update failed, because http://127.0.0.1:8000/appcache/resources/does-not-exist.txt could not be fetched.
+This tests that a manifest that contains a missing file will not crash the browser even if the main resource keeps loading after the error occurs.
+SUCCESS
</ins><span class="cx">Property changes on: trunk/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestshttptestsappcache404resourcewithslowmainresourcephp"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource.php (0 => 178937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource.php (rev 0)
+++ trunk/LayoutTests/http/tests/appcache/404-resource-with-slow-main-resource.php 2015-01-22 21:04:39 UTC (rev 178937)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+<html manifest="resources/404-resource.manifest">
+<div>This tests that a manifest that contains a missing file will not crash the browser even if the main resource keeps loading after the error occurs.</div>
+<div id="result">FAILURE</div>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+function finish()
+{
+ window.stop();
+ document.getElementById('result').innerHTML = 'SUCCESS';
+ document.body.removeChild(document.getElementById('container'));
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+// The test needs to attempt to load a subresource after appcache load fails. There is no way
+// to observe appcache loading progress before onload fires, so we just let it run for a while.
+window.setTimeout(finish, 1000);
+</script>
+
+<div id="container">
+<?php
+ while (True) {
+ usleep(100000);
+ print "<img src='/does-not-exist.png'>\n";
+ flush();
+ }
+?>
+</div>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178936 => 178937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-22 20:35:02 UTC (rev 178936)
+++ trunk/Source/WebCore/ChangeLog 2015-01-22 21:04:39 UTC (rev 178937)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-01-22 Alexey Proskuryakov <ap@apple.com>
+
+ Crash in URL::protocol() after appcache load fails
+ https://bugs.webkit.org/show_bug.cgi?id=140755
+ rdar://problem/7881290
+
+ Reviewed by Dan Bates.
+
+ Test: http/tests/appcache/404-resource-with-slow-main-resource.php
+
+ Not every cache that isn't being updated is complete. It could also be in a zombie
+ state after failing to load. We get rid of the cache once the main resource finishes
+ loading, but while it's being loaded, the zombie still looks like a regular
+ candidate application cache.
+
+ * loader/appcache/ApplicationCache.cpp: (WebCore::ApplicationCache::isComplete):
+ * loader/appcache/ApplicationCache.h:
+ Removed const from isComplete(), because otherwise we couldn't use ApplicationCacheGroup::m_caches.contains().
+ Constness doesn't make a lot of sense for these objects anyway.
+
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::failedLoadingMainResource): Toned down an assertion.
+ We can fail a main resource load when the document has a zombie appcache, too.
+
+ * loader/appcache/ApplicationCacheGroup.h:
+ (WebCore::ApplicationCacheGroup::cacheIsComplete):
+ (WebCore::ApplicationCacheGroup::cacheIsBeingUpdated): Deleted.
+ These functions are only used in ApplicationCache::isComplete().
+
</ins><span class="cx"> 2015-01-22 Grzegorz Czajkowski <g.czajkowski@samsung.com>
</span><span class="cx">
</span><span class="cx"> Avoid defining always empty Vector<TextCheckingResult>
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp (178936 => 178937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2015-01-22 20:35:02 UTC (rev 178936)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2015-01-22 21:04:39 UTC (rev 178937)
</span><span class="lines">@@ -62,9 +62,9 @@
</span><span class="cx"> m_group = group;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ApplicationCache::isComplete() const
</del><ins>+bool ApplicationCache::isComplete()
</ins><span class="cx"> {
</span><del>- return !m_group->cacheIsBeingUpdated(this);
</del><ins>+ return m_group && m_group->cacheIsComplete(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ApplicationCache::setManifestResource(PassRefPtr<ApplicationCacheResource> manifest)
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.h (178936 => 178937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCache.h 2015-01-22 20:35:02 UTC (rev 178936)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.h 2015-01-22 21:04:39 UTC (rev 178937)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> void setGroup(ApplicationCacheGroup*);
</span><span class="cx"> ApplicationCacheGroup* group() const { return m_group; }
</span><span class="cx">
</span><del>- bool isComplete() const;
</del><ins>+ bool isComplete();
</ins><span class="cx">
</span><span class="cx"> ApplicationCacheResource* resourceForRequest(const ResourceRequest&);
</span><span class="cx"> ApplicationCacheResource* resourceForURL(const String& url);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (178936 => 178937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2015-01-22 20:35:02 UTC (rev 178936)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2015-01-22 21:04:39 UTC (rev 178937)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> case Failure:
</span><span class="cx"> // Cache update failed, too.
</span><span class="cx"> ASSERT(!m_cacheBeingUpdated); // Already cleared out by stopLoading().
</span><del>- ASSERT(!loader->applicationCacheHost()->applicationCache() || loader->applicationCacheHost()->applicationCache() == m_cacheBeingUpdated);
</del><ins>+ ASSERT(!loader->applicationCacheHost()->applicationCache() || loader->applicationCacheHost()->applicationCache()->group() == this);
</ins><span class="cx">
</span><span class="cx"> loader->applicationCacheHost()->setApplicationCache(0); // Will unset candidate, too.
</span><span class="cx"> m_associatedDocumentLoaders.remove(loader);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h (178936 => 178937)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2015-01-22 20:35:02 UTC (rev 178936)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2015-01-22 21:04:39 UTC (rev 178937)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx">
</span><span class="cx"> void abort(Frame*);
</span><span class="cx">
</span><del>- bool cacheIsBeingUpdated(const ApplicationCache* cache) const { return cache == m_cacheBeingUpdated; }
</del><ins>+ bool cacheIsComplete(ApplicationCache* cache) { return m_caches.contains(cache); }
</ins><span class="cx">
</span><span class="cx"> void stopLoadingInFrame(Frame*);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>