Changeset 280623 in webkit

Timestamp:

Aug 3, 2021, 5:02:49 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Null check self.session after calling _cancel instead of before
​https://bugs.webkit.org/show_bug.cgi?id=228757
<rdar://79224868>

Patch by Alex Christensen <​achristensen@webkit.org> on 2021-08-03
Reviewed by Geoffrey Garen.

_cancel already null checks self.session before using it.
It seems to be setting self.session to null after the null check, so move the null check to before we use it.
This should fix an occasional crash during teardown.

• platform/network/cocoa/WebCoreNSURLSession.mm:

(-[WebCoreNSURLSessionDataTask _restart]):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-03  Alex Christensen  <achristensen@webkit.org>
+
+        Null check self.session after calling _cancel instead of before
+        https://bugs.webkit.org/show_bug.cgi?id=228757
+        <rdar://79224868>
+
+        Reviewed by Geoffrey Garen.
+
+        _cancel already null checks self.session before using it.
+        It seems to be setting self.session to null after the null check, so move the null check to before we use it.
+        This should fix an occasional crash during teardown.
+
+        * platform/network/cocoa/WebCoreNSURLSession.mm:
+        (-[WebCoreNSURLSessionDataTask _restart]):
+
 2021-08-03  Kimmo Kinnunen  <kkinnunen@apple.com>
 

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

@@ -718 +718 @@
     ASSERT(isMainThread());
 
+    [self _cancel];
+
     if (!self.session)
         return;
-
-    [self _cancel];
 
     if ([self.session rangeResponseGenerator].willHandleRequest(self, self.originalRequest))