<!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>[207454] trunk/Source/WebKit2</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/207454">207454</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-17 23:03:55 -0700 (Mon, 17 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>NetworkSession: PendingDownload is leaked if canceled before willDecidePendingDownloadDestination
https://bugs.webkit.org/show_bug.cgi?id=163545
Reviewed by Alex Christensen.
If a download started by DownloadManager::startDownload() is cancelled before
DownloadManager::willDecidePendingDownloadDestination() is called, DownloadManager::cancelDownload() does
nothing, because the Download hasn't been created yet and m_downloadsWaitingForDestination map doesn't contain
the download ID, and the PendingDownload is never removed from the m_pendingDownloads map.
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::cancelDownload): Always take the PendingDownload from m_pendingDownloads map. Then, if
the download was already in m_downloadsWaitingForDestination map, get the network data task to properly cancel
it and then call the completion handler to ignore the request. Otherwise cancel the pending download if exists.
* NetworkProcess/Downloads/PendingDownload.cpp:
(WebKit::PendingDownload::cancel): Cancel the network load and notify the UI process that the download was canceled.
* NetworkProcess/Downloads/PendingDownload.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadcpp">trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh">trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207453 => 207454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-18 02:02:48 UTC (rev 207453)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-18 06:03:55 UTC (rev 207454)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-10-17 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ NetworkSession: PendingDownload is leaked if canceled before willDecidePendingDownloadDestination
+ https://bugs.webkit.org/show_bug.cgi?id=163545
+
+ Reviewed by Alex Christensen.
+
+ If a download started by DownloadManager::startDownload() is cancelled before
+ DownloadManager::willDecidePendingDownloadDestination() is called, DownloadManager::cancelDownload() does
+ nothing, because the Download hasn't been created yet and m_downloadsWaitingForDestination map doesn't contain
+ the download ID, and the PendingDownload is never removed from the m_pendingDownloads map.
+
+ * NetworkProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::cancelDownload): Always take the PendingDownload from m_pendingDownloads map. Then, if
+ the download was already in m_downloadsWaitingForDestination map, get the network data task to properly cancel
+ it and then call the completion handler to ignore the request. Otherwise cancel the pending download if exists.
+ * NetworkProcess/Downloads/PendingDownload.cpp:
+ (WebKit::PendingDownload::cancel): Cancel the network load and notify the UI process that the download was canceled.
+ * NetworkProcess/Downloads/PendingDownload.h:
+
</ins><span class="cx"> 2016-10-17 Megan Gardner <megan_gardner@apple.com>
</span><span class="cx">
</span><span class="cx"> Add test and infrastructure for link popover
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (207453 => 207454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-10-18 02:02:48 UTC (rev 207453)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-10-18 06:03:55 UTC (rev 207454)
</span><span class="lines">@@ -158,15 +158,30 @@
</span><span class="cx"> void DownloadManager::cancelDownload(DownloadID downloadID)
</span><span class="cx"> {
</span><span class="cx"> if (Download* download = m_downloads.get(downloadID)) {
</span><ins>+#if USE(NETWORK_SESSION)
+ ASSERT(!m_downloadsWaitingForDestination.contains(downloadID));
+ ASSERT(!m_pendingDownloads.contains(downloadID));
+#endif
</ins><span class="cx"> download->cancel();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- if (auto completionHandler = m_downloadsWaitingForDestination.take(downloadID).second) {
</del><ins>+ auto pendingDownload = m_pendingDownloads.take(downloadID);
+ if (m_downloadsWaitingForDestination.contains(downloadID)) {
+ auto pair = m_downloadsWaitingForDestination.take(downloadID);
+ auto networkDataTask = WTFMove(pair.first);
+ auto completionHandler = WTFMove(pair.second);
+ ASSERT(networkDataTask);
+ ASSERT(completionHandler);
+
+ networkDataTask->cancel();
+ completionHandler(PolicyIgnore);
</ins><span class="cx"> m_client.pendingDownloadCanceled(downloadID);
</span><del>- completionHandler(PolicyIgnore);
</del><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
+ if (pendingDownload)
+ pendingDownload->cancel();
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp (207453 => 207454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp 2016-10-18 02:02:48 UTC (rev 207453)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp 2016-10-18 06:03:55 UTC (rev 207454)
</span><span class="lines">@@ -58,6 +58,13 @@
</span><span class="cx"> m_networkLoad->continueWillSendRequest(WTFMove(newRequest));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PendingDownload::cancel()
+{
+ ASSERT(m_networkLoad);
+ m_networkLoad->cancel();
+ send(Messages::DownloadProxy::DidCancel({ }));
+}
+
</ins><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> void PendingDownload::canAuthenticateAgainstProtectionSpaceAsync(const WebCore::ProtectionSpace& protectionSpace)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h (207453 => 207454)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-10-18 02:02:48 UTC (rev 207453)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-10-18 06:03:55 UTC (rev 207454)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(bool canAuthenticate);
</span><span class="cx"> #endif
</span><ins>+ void cancel();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // NetworkLoadClient.
</span></span></pre>
</div>
</div>
</body>
</html>