<!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>[212198] 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/212198">212198</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-02-11 20:10:20 -0800 (Sat, 11 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix crashes after [NSURLSession invalidateAndCancel]
https://bugs.webkit.org/show_bug.cgi?id=168181
<rdar://problem/29813868>
Reviewed by Brady Eidson.
When we call NetworkSessionCocoa::invalidateAndCancel, we intend for the session to immediately
become invalid and stop doing things. [NSURLSession invalidateAndCancel] asynchronously cancels
everything and then calls the delegate's didBecomeInvalidWithError, so before this change there
is a time when we have torn down the session with SessionTracker::destroySession but we can still
get a delegate callback which assumes the session and its NetworkStorageSession exists. If we
get any delegate callbacks after a NetworkSession has been invalidated, we will want to ignore them.
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate sessionInvalidated]):
(-[WKNetworkSessionDelegate URLSession:didBecomeInvalidWithError:]):
(-[WKNetworkSessionDelegate URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:]):
(-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:task:_schemeUpgraded:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:task:didCompleteWithError:]):
(-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
(-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveData:]):
(-[WKNetworkSessionDelegate URLSession:downloadTask:didFinishDownloadingToURL:]):
(-[WKNetworkSessionDelegate URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:]):
(-[WKNetworkSessionDelegate URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:]):
(-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
The pointer to the NetworkSessionCocoa can now be null. We need to check it.
(WebKit::NetworkSessionCocoa::invalidateAndCancel):
Synchronously remove the connection between the delegates and the NetworkSessionCocoa.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212197 => 212198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-12 03:18:09 UTC (rev 212197)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-12 04:10:20 UTC (rev 212198)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2017-02-11 Alex Christensen <achristensen@webkit.org>
+
+ Fix crashes after [NSURLSession invalidateAndCancel]
+ https://bugs.webkit.org/show_bug.cgi?id=168181
+ <rdar://problem/29813868>
+
+ Reviewed by Brady Eidson.
+
+ When we call NetworkSessionCocoa::invalidateAndCancel, we intend for the session to immediately
+ become invalid and stop doing things. [NSURLSession invalidateAndCancel] asynchronously cancels
+ everything and then calls the delegate's didBecomeInvalidWithError, so before this change there
+ is a time when we have torn down the session with SessionTracker::destroySession but we can still
+ get a delegate callback which assumes the session and its NetworkStorageSession exists. If we
+ get any delegate callbacks after a NetworkSession has been invalidated, we will want to ignore them.
+
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate sessionInvalidated]):
+ (-[WKNetworkSessionDelegate URLSession:didBecomeInvalidWithError:]):
+ (-[WKNetworkSessionDelegate URLSession:task:didSendBodyData:totalBytesSent:totalBytesExpectedToSend:]):
+ (-[WKNetworkSessionDelegate URLSession:task:willPerformHTTPRedirection:newRequest:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:task:_schemeUpgraded:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:task:didCompleteWithError:]):
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveResponse:completionHandler:]):
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didReceiveData:]):
+ (-[WKNetworkSessionDelegate URLSession:downloadTask:didFinishDownloadingToURL:]):
+ (-[WKNetworkSessionDelegate URLSession:downloadTask:didWriteData:totalBytesWritten:totalBytesExpectedToWrite:]):
+ (-[WKNetworkSessionDelegate URLSession:downloadTask:didResumeAtOffset:expectedTotalBytes:]):
+ (-[WKNetworkSessionDelegate URLSession:dataTask:didBecomeDownloadTask:]):
+ The pointer to the NetworkSessionCocoa can now be null. We need to check it.
+ (WebKit::NetworkSessionCocoa::invalidateAndCancel):
+ Synchronously remove the connection between the delegates and the NetworkSessionCocoa.
+
</ins><span class="cx"> 2017-02-10 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> Updates to Resource Load Statistics: Get the right website data store and introduce timeout for user interaction
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (212197 => 212198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-02-12 03:18:09 UTC (rev 212197)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2017-02-12 04:10:20 UTC (rev 212198)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (id)initWithNetworkSession:(WebKit::NetworkSessionCocoa&)session withCredentials:(bool)withCredentials;
</span><ins>+- (void)sessionInvalidated;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -104,13 +105,21 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)URLSession:(NSURLSession *)session didBecomeInvalidWithError:(nullable NSError *)error
</del><ins>+- (void)sessionInvalidated
</ins><span class="cx"> {
</span><span class="cx"> _session = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)URLSession:(NSURLSession *)session didBecomeInvalidWithError:(nullable NSError *)error
+{
+ ASSERT(!_session);
+}
+
</ins><span class="cx"> - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didSendBodyData:(int64_t)bytesSent totalBytesSent:(int64_t)totalBytesSent totalBytesExpectedToSend:(int64_t)totalBytesExpectedToSend
</span><span class="cx"> {
</span><ins>+ if (!_session)
+ return;
+
</ins><span class="cx"> auto storedCredentials = _withCredentials ? WebCore::StoredCredentials::AllowStoredCredentials : WebCore::StoredCredentials::DoNotAllowStoredCredentials;
</span><span class="cx"> if (auto* networkDataTask = _session->dataTaskForIdentifier(task.taskIdentifier, storedCredentials))
</span><span class="cx"> networkDataTask->didSendData(totalBytesSent, totalBytesExpectedToSend);
</span><span class="lines">@@ -118,6 +127,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task willPerformHTTPRedirection:(NSHTTPURLResponse *)response newRequest:(NSURLRequest *)request completionHandler:(void (^)(NSURLRequest *))completionHandler
</span><span class="cx"> {
</span><ins>+ if (!_session) {
+ completionHandler(nil);
+ return;
+ }
+
</ins><span class="cx"> auto taskIdentifier = task.taskIdentifier;
</span><span class="cx"> LOG(NetworkSession, "%llu willPerformHTTPRedirection from %s to %s", taskIdentifier, response.URL.absoluteString.UTF8String, request.URL.absoluteString.UTF8String);
</span><span class="cx">
</span><span class="lines">@@ -137,6 +151,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask*)task _schemeUpgraded:(NSURLRequest*)request completionHandler:(void (^)(NSURLRequest*))completionHandler
</span><span class="cx"> {
</span><ins>+ if (!_session) {
+ completionHandler(nil);
+ return;
+ }
+
</ins><span class="cx"> auto taskIdentifier = task.taskIdentifier;
</span><span class="cx"> LOG(NetworkSession, "%llu _schemeUpgraded %s", taskIdentifier, request.URL.absoluteString.UTF8String);
</span><span class="cx">
</span><span class="lines">@@ -156,6 +175,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask willCacheResponse:(NSCachedURLResponse *)proposedResponse completionHandler:(void (^)(NSCachedURLResponse * _Nullable cachedResponse))completionHandler
</span><span class="cx"> {
</span><ins>+ if (!_session) {
+ completionHandler(nil);
+ return;
+ }
+
</ins><span class="cx"> // FIXME: remove if <rdar://problem/20001985> is ever resolved.
</span><span class="cx"> if ([proposedResponse.response respondsToSelector:@selector(allHeaderFields)]
</span><span class="cx"> && [[(id)proposedResponse.response allHeaderFields] objectForKey:@"Content-Range"])
</span><span class="lines">@@ -166,6 +190,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential *credential))completionHandler
</span><span class="cx"> {
</span><ins>+ if (!_session) {
+ completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
+ return;
+ }
+
</ins><span class="cx"> auto taskIdentifier = task.taskIdentifier;
</span><span class="cx"> LOG(NetworkSession, "%llu didReceiveChallenge", taskIdentifier);
</span><span class="cx">
</span><span class="lines">@@ -207,6 +236,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error
</span><span class="cx"> {
</span><ins>+ if (!_session)
+ return;
+
</ins><span class="cx"> LOG(NetworkSession, "%llu didCompleteWithError %@", task.taskIdentifier, error);
</span><span class="cx"> auto storedCredentials = _withCredentials ? WebCore::StoredCredentials::AllowStoredCredentials : WebCore::StoredCredentials::DoNotAllowStoredCredentials;
</span><span class="cx"> if (auto* networkDataTask = _session->dataTaskForIdentifier(task.taskIdentifier, storedCredentials))
</span><span class="lines">@@ -232,6 +264,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveResponse:(NSURLResponse *)response completionHandler:(void (^)(NSURLSessionResponseDisposition disposition))completionHandler
</span><span class="cx"> {
</span><ins>+ if (!_session) {
+ completionHandler(NSURLSessionResponseCancel);
+ return;
+ }
+
</ins><span class="cx"> auto taskIdentifier = dataTask.taskIdentifier;
</span><span class="cx"> LOG(NetworkSession, "%llu didReceiveResponse", taskIdentifier);
</span><span class="cx"> auto storedCredentials = _withCredentials ? WebCore::StoredCredentials::AllowStoredCredentials : WebCore::StoredCredentials::DoNotAllowStoredCredentials;
</span><span class="lines">@@ -265,6 +302,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didReceiveData:(NSData *)data
</span><span class="cx"> {
</span><ins>+ if (!_session)
+ return;
+
</ins><span class="cx"> auto storedCredentials = _withCredentials ? WebCore::StoredCredentials::AllowStoredCredentials : WebCore::StoredCredentials::DoNotAllowStoredCredentials;
</span><span class="cx"> if (auto* networkDataTask = _session->dataTaskForIdentifier(dataTask.taskIdentifier, storedCredentials))
</span><span class="cx"> networkDataTask->didReceiveData(WebCore::SharedBuffer::wrapNSData(data));
</span><span class="lines">@@ -272,6 +312,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location
</span><span class="cx"> {
</span><ins>+ if (!_session)
+ return;
+
</ins><span class="cx"> auto downloadID = _session->takeDownloadID([downloadTask taskIdentifier]);
</span><span class="cx"> if (auto* download = WebKit::NetworkProcess::singleton().downloadManager().download(downloadID))
</span><span class="cx"> download->didFinish();
</span><span class="lines">@@ -279,6 +322,9 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
</span><span class="cx"> {
</span><ins>+ if (!_session)
+ return;
+
</ins><span class="cx"> auto storedCredentials = _withCredentials ? WebCore::StoredCredentials::AllowStoredCredentials : WebCore::StoredCredentials::DoNotAllowStoredCredentials;
</span><span class="cx"> ASSERT_WITH_MESSAGE_UNUSED(storedCredentials, !_session->dataTaskForIdentifier([downloadTask taskIdentifier], storedCredentials), "The NetworkDataTask should be destroyed immediately after didBecomeDownloadTask returns");
</span><span class="cx">
</span><span class="lines">@@ -289,11 +335,17 @@
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didResumeAtOffset:(int64_t)fileOffset expectedTotalBytes:(int64_t)expectedTotalBytes
</span><span class="cx"> {
</span><ins>+ if (!_session)
+ return;
+
</ins><span class="cx"> notImplemented();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dataTask didBecomeDownloadTask:(NSURLSessionDownloadTask *)downloadTask
</span><span class="cx"> {
</span><ins>+ if (!_session)
+ return;
+
</ins><span class="cx"> auto storedCredentials = _withCredentials ? WebCore::StoredCredentials::AllowStoredCredentials : WebCore::StoredCredentials::DoNotAllowStoredCredentials;
</span><span class="cx"> if (auto* networkDataTask = _session->dataTaskForIdentifier([dataTask taskIdentifier], storedCredentials)) {
</span><span class="cx"> Ref<NetworkDataTaskCocoa> protectedNetworkDataTask(*networkDataTask);
</span><span class="lines">@@ -469,9 +521,10 @@
</span><span class="cx">
</span><span class="cx"> [m_sessionWithCredentialStorage invalidateAndCancel];
</span><span class="cx"> [m_sessionWithoutCredentialStorage invalidateAndCancel];
</span><ins>+ [m_sessionWithCredentialStorageDelegate sessionInvalidated];
+ [m_sessionWithoutCredentialStorageDelegate sessionInvalidated];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> void NetworkSessionCocoa::clearCredentials()
</span><span class="cx"> {
</span><span class="cx"> #if !USE(CREDENTIAL_STORAGE_WITH_NETWORK_SESSION)
</span></span></pre>
</div>
</div>
</body>
</html>