<!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>[172151] trunk/Source/WebCore</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/172151">172151</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-08-06 10:23:04 -0700 (Wed, 06 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] QuickLook returns an invalid MIME type for some documents
https://bugs.webkit.org/show_bug.cgi?id=135651
Reviewed by David Kilzer.
In some cases QuickLook indicates a failure by returning a nil MIME type in -[QLPreviewConverter previewResponse]
rather than calling connection:didFailWithError:. Calling ResourceLoader::didReceiveResponse() with a response
containing a nil MIME type leads to a crash.
Stop loading the resource and display an error page if QuickLook cannot provide a MIME type for the converted response.
No new tests. QuickLook is not testable from WebKit.
* platform/network/ios/QuickLook.mm:
(-[WebResourceLoaderQuickLookDelegate _sendDidReceiveResponseIfNecessary]): Called ResourceLoader::didFail() if
MIME type was nil. Called ResourceLoader::didReceiveResponse() otherwise.
(-[WebResourceLoaderQuickLookDelegate connection:didReceiveDataArray:]): Called -_sendDidReceiveResponseIfNecessary.
(-[WebResourceLoaderQuickLookDelegate connection:didReceiveData:lengthReceived:]): Ditto.
(-[WebResourceLoaderQuickLookDelegate connection:didFailWithError:]): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkiosQuickLookmm">trunk/Source/WebCore/platform/network/ios/QuickLook.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172150 => 172151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-06 16:02:33 UTC (rev 172150)
+++ trunk/Source/WebCore/ChangeLog 2014-08-06 17:23:04 UTC (rev 172151)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-08-06 Andy Estes <aestes@apple.com>
+
+ [iOS] QuickLook returns an invalid MIME type for some documents
+ https://bugs.webkit.org/show_bug.cgi?id=135651
+
+ Reviewed by David Kilzer.
+
+ In some cases QuickLook indicates a failure by returning a nil MIME type in -[QLPreviewConverter previewResponse]
+ rather than calling connection:didFailWithError:. Calling ResourceLoader::didReceiveResponse() with a response
+ containing a nil MIME type leads to a crash.
+
+ Stop loading the resource and display an error page if QuickLook cannot provide a MIME type for the converted response.
+
+ No new tests. QuickLook is not testable from WebKit.
+
+ * platform/network/ios/QuickLook.mm:
+ (-[WebResourceLoaderQuickLookDelegate _sendDidReceiveResponseIfNecessary]): Called ResourceLoader::didFail() if
+ MIME type was nil. Called ResourceLoader::didReceiveResponse() otherwise.
+ (-[WebResourceLoaderQuickLookDelegate connection:didReceiveDataArray:]): Called -_sendDidReceiveResponseIfNecessary.
+ (-[WebResourceLoaderQuickLookDelegate connection:didReceiveData:lengthReceived:]): Ditto.
+ (-[WebResourceLoaderQuickLookDelegate connection:didFailWithError:]): Ditto.
+
</ins><span class="cx"> 2014-08-06 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r163382): Overflow hidden for inner elements breaks blurring
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosQuickLookmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/QuickLook.mm (172150 => 172151)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2014-08-06 16:02:33 UTC (rev 172150)
+++ trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2014-08-06 17:23:04 UTC (rev 172151)
</span><span class="lines">@@ -324,6 +324,7 @@
</span><span class="cx"> @interface WebResourceLoaderQuickLookDelegate : NSObject <NSURLConnectionDelegate> {
</span><span class="cx"> RefPtr<ResourceLoader> _resourceLoader;
</span><span class="cx"> BOOL _hasSentDidReceiveResponse;
</span><ins>+ BOOL _hasFailed;
</ins><span class="cx"> }
</span><span class="cx"> @property (nonatomic) QuickLookHandle* quickLookHandle;
</span><span class="cx"> @end
</span><span class="lines">@@ -340,6 +341,24 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)_sendDidReceiveResponseIfNecessary
+{
+ if (_hasSentDidReceiveResponse || _hasFailed || !_quickLookHandle)
+ return;
+
+ // QuickLook might fail to convert a document without calling connection:didFailWithError: (see <rdar://problem/17927972>).
+ // A nil MIME type is an indication of such a failure, so stop loading the resource and ignore subsequent delegate messages.
+ NSURLResponse *previewResponse = _quickLookHandle->nsResponse();
+ if (![previewResponse MIMEType]) {
+ _hasFailed = YES;
+ _resourceLoader->didFail(_resourceLoader->cannotShowURLError());
+ return;
+ }
+
+ _hasSentDidReceiveResponse = YES;
+ _resourceLoader->didReceiveResponse(previewResponse);
+}
+
</ins><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><span class="cx"> - (void)connection:(NSURLConnection *)connection didReceiveDataArray:(NSArray *)dataArray
</span><span class="cx"> {
</span><span class="lines">@@ -347,10 +366,9 @@
</span><span class="cx"> if (!_resourceLoader)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!_hasSentDidReceiveResponse && _quickLookHandle) {
- _hasSentDidReceiveResponse = YES;
- _resourceLoader->didReceiveResponse(_quickLookHandle->nsResponse());
- }
</del><ins>+ [self _sendDidReceiveResponseIfNecessary];
+ if (_hasFailed)
+ return;
</ins><span class="cx">
</span><span class="cx"> _resourceLoader->didReceiveDataArray(reinterpret_cast<CFArrayRef>(dataArray));
</span><span class="cx"> }
</span><span class="lines">@@ -362,10 +380,9 @@
</span><span class="cx"> if (!_resourceLoader)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!_hasSentDidReceiveResponse && _quickLookHandle) {
- _hasSentDidReceiveResponse = YES;
- _resourceLoader->didReceiveResponse(_quickLookHandle->nsResponse());
- }
</del><ins>+ [self _sendDidReceiveResponseIfNecessary];
+ if (_hasFailed)
+ return;
</ins><span class="cx">
</span><span class="cx"> // QuickLook code sends us a nil data at times. The check below is the same as the one in
</span><span class="cx"> // ResourceHandleMac.cpp added for a different bug.
</span><span class="lines">@@ -388,10 +405,9 @@
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(connection);
</span><span class="cx">
</span><del>- if (!_hasSentDidReceiveResponse && _quickLookHandle) {
- _hasSentDidReceiveResponse = YES;
- _resourceLoader->didReceiveResponse(_quickLookHandle->nsResponse());
- }
</del><ins>+ [self _sendDidReceiveResponseIfNecessary];
+ if (_hasFailed)
+ return;
</ins><span class="cx">
</span><span class="cx"> _resourceLoader->didFail(ResourceError(error));
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>