Merge pull request #2319 from onevcat/fix/duplicated-completion-call

Fix a potential duplicated completion invoking when task cancel
onevcat · Nov 19, 2024 · 6d8b529 · 6d8b529
2 parents 2dd662b + a4f36b1
commit 6d8b529
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Sources/Networking/SessionDataTask.swift b/Sources/Networking/SessionDataTask.swift
@@ -101,10 +101,13 @@ public class SessionDataTask: @unchecked Sendable {
         return nil
     }
 
-    func removeAllCallbacks() -> Void {
+    @discardableResult
+    func removeAllCallbacks() -> [TaskCallback] {
         lock.lock()
         defer { lock.unlock() }
+        let callbacks = callbacksStore.values
         callbacksStore.removeAll()
+        return Array(callbacks)
     }
 
     func resume() {

diff --git a/Sources/Networking/SessionDelegate.swift b/Sources/Networking/SessionDelegate.swift
@@ -263,7 +263,8 @@ extension SessionDelegate: URLSessionDataDelegate {
         guard let sessionTask = self.task(for: task) else {
             return
         }
-        sessionTask.onTaskDone.call((result, sessionTask.callbacks))
+        let callbacks = sessionTask.removeAllCallbacks()
+        sessionTask.onTaskDone.call((result, callbacks))
         remove(sessionTask)
     }
 }