Changeset 224960 in webkit

Timestamp:

Nov 16, 2017 9:49:55 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Fix occasional crash when adding and removing videos
​https://bugs.webkit.org/show_bug.cgi?id=179792

Reviewed by Geoffrey Garen.

In taskCompleted we null out session, and in resume we call _restart on the main thread.
If _restart is called after taskCompleted, we want to do nothing.
Right now we are calling a method on self.session.loader which is a PlatformMediaResourceLoader&
but in ObjC if session is null it will call PlatformMediaResourceLoader::requestResource with a
null this pointer, which crashes. Let's not crash.

• platform/network/cocoa/WebCoreNSURLSession.mm:

(-[WebCoreNSURLSessionDataTask _restart]):
Early return if we don't have a session.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cocoa/WebCoreNSURLSession.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-16  Alex Christensen  <achristensen@webkit.org>
+
+        Fix occasional crash when adding and removing videos
+        https://bugs.webkit.org/show_bug.cgi?id=179792
+
+        Reviewed by Geoffrey Garen.
+
+        In taskCompleted we null out session, and in resume we call _restart on the main thread.
+        If _restart is called after taskCompleted, we want to do nothing.
+        Right now we are calling a method on self.session.loader which is a PlatformMediaResourceLoader&
+        but in ObjC if session is null it will call PlatformMediaResourceLoader::requestResource with a
+        null this pointer, which crashes.  Let's not crash.
+
+        * platform/network/cocoa/WebCoreNSURLSession.mm:
+        (-[WebCoreNSURLSessionDataTask _restart]):
+        Early return if we don't have a session.
+
 2017-11-16  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm

@@ -446 +446 @@
 {
     ASSERT(isMainThread());
+
+    if (!self.session)
+        return;
+
     [self _cancel];