Title: [280693] branches/safari-612.1.27.0-branch/Source/WebCore
- Revision
- 280693
- Author
- [email protected]
- Date
- 2021-08-05 09:26:53 -0700 (Thu, 05 Aug 2021)
Log Message
Cherry-pick r280623. rdar://problem/81517664
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 <[email protected]> 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]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280623 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.27.0-branch/Source/WebCore/ChangeLog (280692 => 280693)
--- branches/safari-612.1.27.0-branch/Source/WebCore/ChangeLog 2021-08-05 16:26:50 UTC (rev 280692)
+++ branches/safari-612.1.27.0-branch/Source/WebCore/ChangeLog 2021-08-05 16:26:53 UTC (rev 280693)
@@ -1,3 +1,38 @@
+2021-08-05 Russell Epstein <[email protected]>
+
+ Cherry-pick r280623. rdar://problem/81517664
+
+ 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 <[email protected]> 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]):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280623 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-08-03 Alex Christensen <[email protected]>
+
+ 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-04 Russell Epstein <[email protected]>
Revert r280492. rdar://problem/81522050
Modified: branches/safari-612.1.27.0-branch/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm (280692 => 280693)
--- branches/safari-612.1.27.0-branch/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2021-08-05 16:26:50 UTC (rev 280692)
+++ branches/safari-612.1.27.0-branch/Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm 2021-08-05 16:26:53 UTC (rev 280693)
@@ -717,11 +717,11 @@
{
ASSERT(isMainThread());
+ [self _cancel];
+
if (!self.session)
return;
- [self _cancel];
-
if ([self.session rangeResponseGenerator].willHandleRequest(self, self.originalRequest))
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
