<!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>[169472] 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/169472">169472</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-05-29 16:04:30 -0700 (Thu, 29 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Loading <object> from WebArchive crashes
https://bugs.webkit.org/show_bug.cgi?id=133386
<rdar://problem/13345509>
Reviewed by Brady Eidson.
Source/WebCore:
Test: webarchive/loading/object.html
This (a) fixes the crash, and (b) avoids the crash.
* loader/DocumentLoader.cpp: (WebCore::DocumentLoader::continueAfterContentPolicy):
Some types of substitute data - such as WebArchive - don't contain HTTP result codes,
so let's not drop to <object> fallback content when status is 0.
And if the load somehow failed anyway, don't crash by trying to deliver substitute data
to a finished loader.
LayoutTests:
* webarchive/loading/object-expected.txt: Added.
* webarchive/loading/object.html: Added.
* webarchive/loading/resources/object.webarchive: 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="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebarchiveloadingobjectexpectedtxt">trunk/LayoutTests/webarchive/loading/object-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebarchiveloadingobjecthtml">trunk/LayoutTests/webarchive/loading/object.html</a></li>
<li><a href="#trunkLayoutTestswebarchiveloadingresourcesobjectwebarchive">trunk/LayoutTests/webarchive/loading/resources/object.webarchive</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169471 => 169472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-29 23:00:59 UTC (rev 169471)
+++ trunk/LayoutTests/ChangeLog 2014-05-29 23:04:30 UTC (rev 169472)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-05-29 Alexey Proskuryakov <ap@apple.com>
+
+ Loading <object> from WebArchive crashes
+ https://bugs.webkit.org/show_bug.cgi?id=133386
+ <rdar://problem/13345509>
+
+ Reviewed by Brady Eidson.
+
+ * webarchive/loading/object-expected.txt: Added.
+ * webarchive/loading/object.html: Added.
+ * webarchive/loading/resources/object.webarchive: Added.
+
</ins><span class="cx"> 2014-05-29 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Gardening: marking js/primitive-property-access-edge-cases.html as crashy.
</span></span></pre></div>
<a id="trunkLayoutTestswebarchiveloadingobjectexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webarchive/loading/object-expected.txt (0 => 169472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webarchive/loading/object-expected.txt (rev 0)
+++ trunk/LayoutTests/webarchive/loading/object-expected.txt 2014-05-29 23:04:30 UTC (rev 169472)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - willPerformClientRedirectToURL: resources/object.webarchive
+main frame - didFinishDocumentLoadForFrame
+main frame - didFinishLoadForFrame
+main frame - didStartProvisionalLoadForFrame
+main frame - didCancelClientRedirectForFrame
+main frame - didCommitLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
+main frame - didFinishLoadForFrame
+Loading this webarchive with an object should not crash.
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/webarchive/loading/object-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="trunkLayoutTestswebarchiveloadingobjecthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webarchive/loading/object.html (0 => 169472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webarchive/loading/object.html (rev 0)
+++ trunk/LayoutTests/webarchive/loading/object.html 2014-05-29 23:04:30 UTC (rev 169472)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+}
+
+window.location="resources/object.webarchive";
+</script>
</ins><span class="cx">Property changes on: trunk/LayoutTests/webarchive/loading/object.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestswebarchiveloadingresourcesobjectwebarchive"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/webarchive/loading/resources/object.webarchive</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/webarchive/loading/resources/object.webarchive
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169471 => 169472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-29 23:00:59 UTC (rev 169471)
+++ trunk/Source/WebCore/ChangeLog 2014-05-29 23:04:30 UTC (rev 169472)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-29 Alexey Proskuryakov <ap@apple.com>
+
+ Loading <object> from WebArchive crashes
+ https://bugs.webkit.org/show_bug.cgi?id=133386
+ <rdar://problem/13345509>
+
+ Reviewed by Brady Eidson.
+
+ Test: webarchive/loading/object.html
+
+ This (a) fixes the crash, and (b) avoids the crash.
+
+ * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::continueAfterContentPolicy):
+ Some types of substitute data - such as WebArchive - don't contain HTTP result codes,
+ so let's not drop to <object> fallback content when status is 0.
+ And if the load somehow failed anyway, don't crash by trying to deliver substitute data
+ to a finished loader.
+
</ins><span class="cx"> 2014-05-29 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [iOS WebGL] Fix depth buffer clearing issue.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (169471 => 169472)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-05-29 23:00:59 UTC (rev 169471)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-05-29 23:04:30 UTC (rev 169472)
</span><span class="lines">@@ -733,8 +733,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_response.isHTTP()) {
</span><del>- int status = m_response.httpStatusCode();
- if (status < 200 || status >= 300) {
</del><ins>+ int status = m_response.httpStatusCode(); // Status may be zero when loading substitute data, in particular from a WebArchive.
+ if (status && (status < 200 || status >= 300)) {
</ins><span class="cx"> bool hostedByObject = frameLoader()->isHostedByObjectElement();
</span><span class="cx">
</span><span class="cx"> frameLoader()->handleFallbackContent();
</span><span class="lines">@@ -746,7 +746,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!isStopping() && m_substituteData.isValid()) {
</del><ins>+ if (!isStopping() && m_substituteData.isValid() && isLoadingMainResource()) {
</ins><span class="cx"> if (m_substituteData.content()->size())
</span><span class="cx"> dataReceived(0, m_substituteData.content()->data(), m_substituteData.content()->size());
</span><span class="cx"> if (isLoadingMainResource())
</span></span></pre>
</div>
</div>
</body>
</html>