<!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>[167055] 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/167055">167055</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-04-09 17:48:45 -0700 (Wed, 09 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/165908">r165908</a>): ~QuickLookHandle() tries to dereference a null ResourceHandle
https://bugs.webkit.org/show_bug.cgi?id=131467
Reviewed by Tim Horton.
QuickLookHandle stored a ResourceHandle pointer in order to later
retrive the URL of its firstRequest(), but after <a href="http://trac.webkit.org/projects/webkit/changeset/165908">r165908</a> we no longer
always have a ResourceHandle. Since firstRequest()'s URL is the only
thing we need from ResourceHandle, store it directly rather than a
ResourceHandle pointer. In the case where we create a QuickLookHandle
from a ResourceLoader rather than a ResourceHandle, pass the loader's
originalRequest(), which represents the same request as firstRequest()
(i.e. the request after willSendRequest() but before redirects).
* platform/network/ios/QuickLook.h:
* platform/network/ios/QuickLook.mm:
(WebCore::QuickLookHandle::QuickLookHandle):
(WebCore::QuickLookHandle::create):
(WebCore::QuickLookHandle::didFail):
(WebCore::QuickLookHandle::~QuickLookHandle):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkiosQuickLookh">trunk/Source/WebCore/platform/network/ios/QuickLook.h</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 (167054 => 167055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-10 00:18:49 UTC (rev 167054)
+++ trunk/Source/WebCore/ChangeLog 2014-04-10 00:48:45 UTC (rev 167055)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-04-09 Andy Estes <aestes@apple.com>
+
+ REGRESSION (r165908): ~QuickLookHandle() tries to dereference a null ResourceHandle
+ https://bugs.webkit.org/show_bug.cgi?id=131467
+
+ Reviewed by Tim Horton.
+
+ QuickLookHandle stored a ResourceHandle pointer in order to later
+ retrive the URL of its firstRequest(), but after r165908 we no longer
+ always have a ResourceHandle. Since firstRequest()'s URL is the only
+ thing we need from ResourceHandle, store it directly rather than a
+ ResourceHandle pointer. In the case where we create a QuickLookHandle
+ from a ResourceLoader rather than a ResourceHandle, pass the loader's
+ originalRequest(), which represents the same request as firstRequest()
+ (i.e. the request after willSendRequest() but before redirects).
+
+ * platform/network/ios/QuickLook.h:
+ * platform/network/ios/QuickLook.mm:
+ (WebCore::QuickLookHandle::QuickLookHandle):
+ (WebCore::QuickLookHandle::create):
+ (WebCore::QuickLookHandle::didFail):
+ (WebCore::QuickLookHandle::~QuickLookHandle):
+
</ins><span class="cx"> 2014-04-09 James Craig <jcraig@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Bug in AccessibilityNodeObject::helpText
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosQuickLookh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/QuickLook.h (167054 => 167055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ios/QuickLook.h 2014-04-10 00:18:49 UTC (rev 167054)
+++ trunk/Source/WebCore/platform/network/ios/QuickLook.h 2014-04-10 00:48:45 UTC (rev 167055)
</span><span class="lines">@@ -106,12 +106,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- QuickLookHandle(ResourceHandle*, NSURLConnection *, NSURLResponse *, id delegate);
-#if USE(CFNETWORK)
- QuickLookHandle(ResourceHandle*, CFURLResponseRef);
-#endif
</del><ins>+ QuickLookHandle(NSURL *, NSURLConnection *, NSURLResponse *, id delegate);
</ins><span class="cx">
</span><del>- ResourceHandle* m_handle;
</del><ins>+ RetainPtr<NSURL> m_firstRequestURL;
</ins><span class="cx"> RetainPtr<id> m_converter;
</span><span class="cx"> RetainPtr<id> m_delegate;
</span><span class="cx"> bool m_finishedLoadingDataIntoConverter;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkiosQuickLookmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ios/QuickLook.mm (167054 => 167055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2014-04-10 00:18:49 UTC (rev 167054)
+++ trunk/Source/WebCore/platform/network/ios/QuickLook.mm 2014-04-10 00:48:45 UTC (rev 167055)
</span><span class="lines">@@ -340,8 +340,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-QuickLookHandle::QuickLookHandle(ResourceHandle* handle, NSURLConnection *connection, NSURLResponse *nsResponse, id delegate)
- : m_handle(handle)
</del><ins>+QuickLookHandle::QuickLookHandle(NSURL *firstRequestURL, NSURLConnection *connection, NSURLResponse *nsResponse, id delegate)
+ : m_firstRequestURL(firstRequestURL)
</ins><span class="cx"> , m_converter(adoptNS([[QLPreviewConverterClass() alloc] initWithConnection:connection delegate:delegate response:nsResponse options:nil]))
</span><span class="cx"> , m_delegate(adoptNS([delegate retain]))
</span><span class="cx"> , m_finishedLoadingDataIntoConverter(false)
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> PassOwnPtr<QuickLookHandle> QuickLookHandle::create(ResourceHandle* handle, NSURLConnection *connection, NSURLResponse *nsResponse, id delegate)
</span><span class="cx"> {
</span><span class="cx"> if (handle->firstRequest().isMainResourceRequest() && [WebCore::QLPreviewGetSupportedMIMETypesSet() containsObject:[nsResponse MIMEType]])
</span><del>- return adoptPtr(new QuickLookHandle(handle, connection, nsResponse, delegate));
</del><ins>+ return adoptPtr(new QuickLookHandle([handle->firstRequest().nsURLRequest(DoNotUpdateHTTPBody) URL], connection, nsResponse, delegate));
</ins><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> if (handle->firstRequest().isMainResourceRequest() && [WebCore::QLPreviewGetSupportedMIMETypesSet() containsObject:(NSString *)CFURLResponseGetMIMEType(cfResponse)]) {
</span><span class="cx"> NSURLResponse *nsResponse = [NSURLResponse _responseWithCFURLResponse:cfResponse];
</span><span class="cx"> WebQuickLookHandleAsDelegate *delegate = [[[WebQuickLookHandleAsDelegate alloc] initWithConnectionDelegate:connectionDelegate] autorelease];
</span><del>- return adoptPtr(new QuickLookHandle(handle, nil, nsResponse, delegate));
</del><ins>+ return adoptPtr(new QuickLookHandle([handle->firstRequest().nsURLRequest(DoNotUpdateHTTPBody) URL], nil, nsResponse, delegate));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> PassOwnPtr<QuickLookHandle> QuickLookHandle::create(ResourceLoader* loader, NSURLResponse *response, id delegate)
</span><span class="cx"> {
</span><span class="cx"> if (loader->request().isMainResourceRequest() && [WebCore::QLPreviewGetSupportedMIMETypesSet() containsObject:[response MIMEType]])
</span><del>- return adoptPtr(new QuickLookHandle(NULL, nil, response, delegate));
</del><ins>+ return adoptPtr(new QuickLookHandle([loader->originalRequest().nsURLRequest(DoNotUpdateHTTPBody) URL], nil, response, delegate));
</ins><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> LOG(Network, "QuickLookHandle::didFail()");
</span><span class="cx"> m_quicklookFileHandle = nullptr;
</span><span class="cx"> // removeQLPreviewConverterForURL deletes the temporary file created.
</span><del>- removeQLPreviewConverterForURL([m_handle->firstRequest().nsURLRequest(DoNotUpdateHTTPBody) URL]);
</del><ins>+ removeQLPreviewConverterForURL(m_firstRequestURL.get());
</ins><span class="cx"> [m_converter.get() finishConverting];
</span><span class="cx"> m_converter = nullptr;
</span><span class="cx"> }
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> LOG(Network, "QuickLookHandle::~QuickLookHandle()");
</span><span class="cx"> if (m_quicklookFileHandle) {
</span><span class="cx"> m_quicklookFileHandle = nullptr;
</span><del>- removeQLPreviewConverterForURL([m_handle->firstRequest().nsURLRequest(DoNotUpdateHTTPBody) URL]);
</del><ins>+ removeQLPreviewConverterForURL(m_firstRequestURL.get());
</ins><span class="cx"> }
</span><span class="cx"> m_converter = nullptr;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>