<!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>[203008] 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/203008">203008</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-07-08 16:49:15 -0700 (Fri, 08 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash in layout test /media/video-buffered-range-contains-currentTime.html
https://bugs.webkit.org/show_bug.cgi?id=159109
<rdar://problem/26535750>
Reviewed by Alex Christensen.
Protect against _dataTasks being mutated and accessed on multiple simultaneous threads with a Lock.
* platform/network/cocoa/WebCoreNSURLSession.h:
* platform/network/cocoa/WebCoreNSURLSession.mm:
(-[WebCoreNSURLSession dealloc]):
(-[WebCoreNSURLSession taskCompleted:]):
(-[WebCoreNSURLSession finishTasksAndInvalidate]):
(-[WebCoreNSURLSession invalidateAndCancel]):
(-[WebCoreNSURLSession getTasksWithCompletionHandler:]):
(-[WebCoreNSURLSession getAllTasksWithCompletionHandler:]):
(-[WebCoreNSURLSession dataTaskWithRequest:]):
(-[WebCoreNSURLSession dataTaskWithURL:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionh">trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm">trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203007 => 203008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-08 23:38:04 UTC (rev 203007)
+++ trunk/Source/WebCore/ChangeLog 2016-07-08 23:49:15 UTC (rev 203008)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-07-08 Jer Noble <jer.noble@apple.com>
+
+ Crash in layout test /media/video-buffered-range-contains-currentTime.html
+ https://bugs.webkit.org/show_bug.cgi?id=159109
+ <rdar://problem/26535750>
+
+ Reviewed by Alex Christensen.
+
+ Protect against _dataTasks being mutated and accessed on multiple simultaneous threads with a Lock.
+
+ * platform/network/cocoa/WebCoreNSURLSession.h:
+ * platform/network/cocoa/WebCoreNSURLSession.mm:
+ (-[WebCoreNSURLSession dealloc]):
+ (-[WebCoreNSURLSession taskCompleted:]):
+ (-[WebCoreNSURLSession finishTasksAndInvalidate]):
+ (-[WebCoreNSURLSession invalidateAndCancel]):
+ (-[WebCoreNSURLSession getTasksWithCompletionHandler:]):
+ (-[WebCoreNSURLSession getAllTasksWithCompletionHandler:]):
+ (-[WebCoreNSURLSession dataTaskWithRequest:]):
+ (-[WebCoreNSURLSession dataTaskWithURL:]):
+
</ins><span class="cx"> 2016-07-08 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Prevent fullscreen video dimension state from being reset after configuring.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h (203007 => 203008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h 2016-07-08 23:38:04 UTC (rev 203007)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.h 2016-07-08 23:49:15 UTC (rev 203008)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/NSURLSession.h>
</span><span class="cx"> #import <wtf/HashSet.h>
</span><ins>+#import <wtf/Lock.h>
</ins><span class="cx"> #import <wtf/OSObjectPtr.h>
</span><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="lines">@@ -63,6 +64,7 @@
</span><span class="cx"> RetainPtr<NSOperationQueue> _queue;
</span><span class="cx"> NSString *_sessionDescription;
</span><span class="cx"> HashSet<RetainPtr<WebCoreNSURLSessionDataTask>> _dataTasks;
</span><ins>+ Lock _dataTasksLock;
</ins><span class="cx"> BOOL _invalidated;
</span><span class="cx"> BOOL _hasSingleSecurityOrigin;
</span><span class="cx"> NSUInteger _nextTaskIdentifier;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcocoaWebCoreNSURLSessionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (203007 => 203008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-07-08 23:38:04 UTC (rev 203007)
+++ trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2016-07-08 23:49:15 UTC (rev 203008)
</span><span class="lines">@@ -92,8 +92,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- for (auto& task : _dataTasks)
- task.get().session = nil;
</del><ins>+ {
+ Locker<Lock> locker(_dataTasksLock);
+ for (auto& task : _dataTasks)
+ task.get().session = nil;
+ }
</ins><span class="cx">
</span><span class="cx"> callOnMainThread([loader = WTFMove(_loader)] {
</span><span class="cx"> });
</span><span class="lines">@@ -110,12 +113,17 @@
</span><span class="cx">
</span><span class="cx"> - (void)taskCompleted:(WebCoreNSURLSessionDataTask *)task
</span><span class="cx"> {
</span><del>- ASSERT(_dataTasks.contains(task));
</del><span class="cx"> task.session = nil;
</span><del>- _dataTasks.remove(task);
- if (!_dataTasks.isEmpty() || !_invalidated)
- return;
</del><span class="cx">
</span><ins>+ {
+ Locker<Lock> locker(_dataTasksLock);
+
+ ASSERT(_dataTasks.contains(task));
+ _dataTasks.remove(task);
+ if (!_dataTasks.isEmpty() || !_invalidated)
+ return;
+ }
+
</ins><span class="cx"> RetainPtr<WebCoreNSURLSession> strongSelf { self };
</span><span class="cx"> [self addDelegateOperation:[strongSelf] {
</span><span class="cx"> if ([strongSelf.get().delegate respondsToSelector:@selector(URLSession:didBecomeInvalidWithError:)])
</span><span class="lines">@@ -195,8 +203,11 @@
</span><span class="cx"> - (void)finishTasksAndInvalidate
</span><span class="cx"> {
</span><span class="cx"> _invalidated = YES;
</span><del>- if (!_dataTasks.isEmpty())
- return;
</del><ins>+ {
+ Locker<Lock> locker(_dataTasksLock);
+ if (!_dataTasks.isEmpty())
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> RetainPtr<WebCoreNSURLSession> strongSelf { self };
</span><span class="cx"> [self addDelegateOperation:[strongSelf] {
</span><span class="lines">@@ -207,7 +218,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)invalidateAndCancel
</span><span class="cx"> {
</span><del>- for (auto& task : _dataTasks)
</del><ins>+ Vector<RetainPtr<WebCoreNSURLSessionDataTask>> tasksCopy;
+ {
+ Locker<Lock> locker(_dataTasksLock);
+ copyToVector(_dataTasks, tasksCopy);
+ }
+
+ for (auto& task : tasksCopy)
</ins><span class="cx"> [task cancel];
</span><span class="cx">
</span><span class="cx"> [self finishTasksAndInvalidate];
</span><span class="lines">@@ -227,9 +244,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)getTasksWithCompletionHandler:(void (^)(NSArray<NSURLSessionDataTask *> *dataTasks, NSArray<NSURLSessionUploadTask *> *uploadTasks, NSArray<NSURLSessionDownloadTask *> *downloadTasks))completionHandler
</span><span class="cx"> {
</span><del>- NSMutableArray *array = [NSMutableArray arrayWithCapacity:_dataTasks.size()];
- for (auto& task : _dataTasks)
- [array addObject:task.get()];
</del><ins>+ NSMutableArray *array = nullptr;
+ {
+ Locker<Lock> locker(_dataTasksLock);
+ array = [NSMutableArray arrayWithCapacity:_dataTasks.size()];
+ for (auto& task : _dataTasks)
+ [array addObject:task.get()];
+ }
</ins><span class="cx"> [self addDelegateOperation:^{
</span><span class="cx"> completionHandler(array, nil, nil);
</span><span class="cx"> }];
</span><span class="lines">@@ -237,9 +258,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)getAllTasksWithCompletionHandler:(void (^)(NSArray<__kindof NSURLSessionTask *> *tasks))completionHandler
</span><span class="cx"> {
</span><del>- NSMutableArray *array = [NSMutableArray arrayWithCapacity:_dataTasks.size()];
- for (auto& task : _dataTasks)
- [array addObject:task.get()];
</del><ins>+ NSMutableArray *array = nullptr;
+ {
+ Locker<Lock> locker(_dataTasksLock);
+ array = [NSMutableArray arrayWithCapacity:_dataTasks.size()];
+ for (auto& task : _dataTasks)
+ [array addObject:task.get()];
+ }
</ins><span class="cx"> [self addDelegateOperation:^{
</span><span class="cx"> completionHandler(array);
</span><span class="cx"> }];
</span><span class="lines">@@ -253,7 +278,10 @@
</span><span class="cx"> [self updateHasSingleSecurityOrigin:SecurityOrigin::create([request URL])];
</span><span class="cx">
</span><span class="cx"> WebCoreNSURLSessionDataTask *task = [[WebCoreNSURLSessionDataTask alloc] initWithSession:self identifier:_nextTaskIdentifier++ request:request];
</span><del>- _dataTasks.add(task);
</del><ins>+ {
+ Locker<Lock> locker(_dataTasksLock);
+ _dataTasks.add(task);
+ }
</ins><span class="cx"> return (NSURLSessionDataTask *)[task autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -265,7 +293,10 @@
</span><span class="cx"> [self updateHasSingleSecurityOrigin:SecurityOrigin::create(url)];
</span><span class="cx">
</span><span class="cx"> WebCoreNSURLSessionDataTask *task = [[WebCoreNSURLSessionDataTask alloc] initWithSession:self identifier:_nextTaskIdentifier++ URL:url];
</span><del>- _dataTasks.add(task);
</del><ins>+ {
+ Locker<Lock> locker(_dataTasksLock);
+ _dataTasks.add(task);
+ }
</ins><span class="cx"> return (NSURLSessionDataTask *)[task autorelease];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>