<!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>[203133] 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/203133">203133</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-07-12 15:43:20 -0700 (Tue, 12 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2][NetworkSession] Fix unsafe RunLoop::dispatch() in NetworkLoad constructor
https://bugs.webkit.org/show_bug.cgi?id=159691
Reviewed by Brady Eidson.
Remove unsafe RunLoop::dispatch() in NetworkLoad constructor. It captured |this| but there
was no guarantee the NetworkLoad would still be alive by the time the lambda gets executed.
Instead, the constructor now takes a NetworkSession& parameter so that the call sites
have to retrieve the NetworkSession for a given SessionID and deal with the fact that
there may be no such NetworkSession before constructing the NetworkLoad.
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::startDownload):
* NetworkProcess/Downloads/PendingDownload.cpp:
(WebKit::PendingDownload::PendingDownload):
* NetworkProcess/Downloads/PendingDownload.h:
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::NetworkLoad):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::startNetworkLoad):
* NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
(WebKit::NetworkCache::SpeculativeLoad::SpeculativeLoad):</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>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203132 => 203133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-12 22:21:33 UTC (rev 203132)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-12 22:43:20 UTC (rev 203133)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2016-07-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ [WK2][NetworkSession] Fix unsafe RunLoop::dispatch() in NetworkLoad constructor
+ https://bugs.webkit.org/show_bug.cgi?id=159691
+
+ Reviewed by Brady Eidson.
+
+ Remove unsafe RunLoop::dispatch() in NetworkLoad constructor. It captured |this| but there
+ was no guarantee the NetworkLoad would still be alive by the time the lambda gets executed.
+
+ Instead, the constructor now takes a NetworkSession& parameter so that the call sites
+ have to retrieve the NetworkSession for a given SessionID and deal with the fact that
+ there may be no such NetworkSession before constructing the NetworkLoad.
+
+ * NetworkProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::startDownload):
+ * NetworkProcess/Downloads/PendingDownload.cpp:
+ (WebKit::PendingDownload::PendingDownload):
+ * NetworkProcess/Downloads/PendingDownload.h:
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::NetworkLoad):
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::startNetworkLoad):
+ * NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp:
+ (WebKit::NetworkCache::SpeculativeLoad::SpeculativeLoad):
+
+2016-07-12 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> [WK2] Protect against bad database data in LocalStorageDatabase::importItems()
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159663
</span><span class="cx"> <rdar://problem/18995873>
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (203132 => 203133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-07-12 22:21:33 UTC (rev 203132)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-07-12 22:43:20 UTC (rev 203133)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> parameters.sessionID = sessionID;
</span><span class="cx"> parameters.request = request;
</span><span class="cx"> parameters.clientCredentialPolicy = AskClientForAllCredentials;
</span><del>- m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(parameters), downloadID));
</del><ins>+ m_pendingDownloads.add(downloadID, std::make_unique<PendingDownload>(WTFMove(parameters), downloadID, *networkSession));
</ins><span class="cx"> #else
</span><span class="cx"> auto download = std::make_unique<Download>(*this, downloadID, request, suggestedName);
</span><span class="cx"> download->start();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp (203132 => 203133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp 2016-07-12 22:21:33 UTC (rev 203132)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.cpp 2016-07-12 22:43:20 UTC (rev 203133)
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PendingDownload::PendingDownload(NetworkLoadParameters&& parameters, DownloadID downloadID)
- : m_networkLoad(std::make_unique<NetworkLoad>(*this, WTFMove(parameters)))
</del><ins>+PendingDownload::PendingDownload(NetworkLoadParameters&& parameters, DownloadID downloadID, NetworkSession& networkSession)
+ : m_networkLoad(std::make_unique<NetworkLoad>(*this, WTFMove(parameters), networkSession))
</ins><span class="cx"> {
</span><span class="cx"> m_networkLoad->setPendingDownloadID(downloadID);
</span><span class="cx"> m_networkLoad->setPendingDownload(*this);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsPendingDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h (203132 => 203133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-07-12 22:21:33 UTC (rev 203132)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/PendingDownload.h 2016-07-12 22:43:20 UTC (rev 203133)
</span><span class="lines">@@ -40,11 +40,12 @@
</span><span class="cx"> class DownloadID;
</span><span class="cx"> class NetworkLoad;
</span><span class="cx"> class NetworkLoadParameters;
</span><ins>+class NetworkSession;
</ins><span class="cx">
</span><span class="cx"> class PendingDownload : public NetworkLoadClient, public IPC::MessageSender {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- PendingDownload(NetworkLoadParameters&&, DownloadID);
</del><ins>+ PendingDownload(NetworkLoadParameters&&, DownloadID, NetworkSession&);
</ins><span class="cx">
</span><span class="cx"> void continueWillSendRequest(WebCore::ResourceRequest&&);
</span><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(bool canAuthenticate);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (203132 => 203133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-07-12 22:21:33 UTC (rev 203132)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-07-12 22:43:20 UTC (rev 203133)
</span><span class="lines">@@ -41,34 +41,35 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-NetworkLoad::NetworkLoad(NetworkLoadClient& client, NetworkLoadParameters&& parameters)
</del><ins>+#if USE(NETWORK_SESSION)
+
+NetworkLoad::NetworkLoad(NetworkLoadClient& client, NetworkLoadParameters&& parameters, NetworkSession& networkSession)
</ins><span class="cx"> : m_client(client)
</span><span class="cx"> , m_parameters(WTFMove(parameters))
</span><del>-#if !USE(NETWORK_SESSION)
- , m_networkingContext(RemoteNetworkingContext::create(m_parameters.sessionID, m_parameters.shouldClearReferrerOnHTTPSToHTTPRedirect))
-#endif
</del><span class="cx"> , m_currentRequest(m_parameters.request)
</span><span class="cx"> {
</span><del>-#if USE(NETWORK_SESSION)
</del><span class="cx"> if (m_parameters.request.url().protocolIsBlob()) {
</span><span class="cx"> m_handle = ResourceHandle::create(nullptr, m_parameters.request, this, m_parameters.defersLoading, m_parameters.contentSniffingPolicy == SniffContent);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- if (auto* networkSession = SessionTracker::networkSession(m_parameters.sessionID)) {
- m_task = NetworkDataTask::create(*networkSession, *this, m_parameters.request, m_parameters.allowStoredCredentials, m_parameters.contentSniffingPolicy, m_parameters.shouldClearReferrerOnHTTPSToHTTPRedirect);
- if (!m_parameters.defersLoading)
- m_task->resume();
- } else {
- WTFLogAlways("Attempted to create a NetworkLoad with a session (id=%" PRIu64 ") that does not exist.", m_parameters.sessionID.sessionID());
- RunLoop::current().dispatch([this, url = m_parameters.request.url()] {
- didCompleteWithError(internalError(url));
- });
- }
</del><ins>+ m_task = NetworkDataTask::create(networkSession, *this, m_parameters.request, m_parameters.allowStoredCredentials, m_parameters.contentSniffingPolicy, m_parameters.shouldClearReferrerOnHTTPSToHTTPRedirect);
+ if (!m_parameters.defersLoading)
+ m_task->resume();
+}
+
</ins><span class="cx"> #else
</span><ins>+
+NetworkLoad::NetworkLoad(NetworkLoadClient& client, NetworkLoadParameters&& parameters)
+ : m_client(client)
+ , m_parameters(WTFMove(parameters))
+ , m_networkingContext(RemoteNetworkingContext::create(m_parameters.sessionID, m_parameters.shouldClearReferrerOnHTTPSToHTTPRedirect))
+ , m_currentRequest(m_parameters.request)
+{
</ins><span class="cx"> m_handle = ResourceHandle::create(m_networkingContext.get(), m_parameters.request, this, m_parameters.defersLoading, m_parameters.contentSniffingPolicy == SniffContent);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif
+
</ins><span class="cx"> NetworkLoad::~NetworkLoad()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (203132 => 203133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-07-12 22:21:33 UTC (rev 203132)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-07-12 22:43:20 UTC (rev 203133)
</span><span class="lines">@@ -47,7 +47,11 @@
</span><span class="cx"> {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><ins>+#if USE(NETWORK_SESSION)
+ NetworkLoad(NetworkLoadClient&, NetworkLoadParameters&&, NetworkSession&);
+#else
</ins><span class="cx"> NetworkLoad(NetworkLoadClient&, NetworkLoadParameters&&);
</span><ins>+#endif
</ins><span class="cx"> ~NetworkLoad();
</span><span class="cx">
</span><span class="cx"> void setDefersLoading(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (203132 => 203133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-07-12 22:21:33 UTC (rev 203132)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-07-12 22:43:20 UTC (rev 203133)
</span><span class="lines">@@ -34,7 +34,9 @@
</span><span class="cx"> #include "NetworkLoad.h"
</span><span class="cx"> #include "NetworkProcess.h"
</span><span class="cx"> #include "NetworkProcessConnectionMessages.h"
</span><ins>+#include "SessionTracker.h"
</ins><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><ins>+#include "WebErrors.h"
</ins><span class="cx"> #include "WebResourceLoaderMessages.h"
</span><span class="cx"> #include <WebCore/BlobDataFileReference.h>
</span><span class="cx"> #include <WebCore/CertificateInfo.h>
</span><span class="lines">@@ -209,7 +211,18 @@
</span><span class="cx"> NetworkLoadParameters parameters = m_parameters;
</span><span class="cx"> parameters.defersLoading = m_defersLoading;
</span><span class="cx"> parameters.request = request;
</span><ins>+
+#if USE(NETWORK_SESSION)
+ auto* networkSession = SessionTracker::networkSession(parameters.sessionID);
+ if (!networkSession) {
+ WTFLogAlways("Attempted to create a NetworkLoad with a session (id=%" PRIu64 ") that does not exist.", parameters.sessionID.sessionID());
+ didFailLoading(internalError(request.url()));
+ return;
+ }
+ m_networkLoad = std::make_unique<NetworkLoad>(*this, WTFMove(parameters), *networkSession);
+#else
</ins><span class="cx"> m_networkLoad = std::make_unique<NetworkLoad>(*this, WTFMove(parameters));
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::setDefersLoading(bool defers)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheSpeculativeLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp (203132 => 203133)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2016-07-12 22:21:33 UTC (rev 203132)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp 2016-07-12 22:43:20 UTC (rev 203133)
</span><span class="lines">@@ -55,7 +55,11 @@
</span><span class="cx"> parameters.allowStoredCredentials = AllowStoredCredentials;
</span><span class="cx"> parameters.contentSniffingPolicy = DoNotSniffContent;
</span><span class="cx"> parameters.request = m_originalRequest;
</span><ins>+#if USE(NETWORK_SESSION)
+ m_networkLoad = std::make_unique<NetworkLoad>(*this, WTFMove(parameters), NetworkSession::defaultSession());
+#else
</ins><span class="cx"> m_networkLoad = std::make_unique<NetworkLoad>(*this, WTFMove(parameters));
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SpeculativeLoad::~SpeculativeLoad()
</span></span></pre>
</div>
</div>
</body>
</html>