Fix memory leaks in Promise whenAll

apollographql · Feb 13, 2020 · 2da9049 · RolandasRazma · Feb 14, 2020 · designatednerd
1 parent de705bc
commit 2da9049
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Sources/Apollo/Promise.swift b/Sources/Apollo/Promise.swift
@@ -3,6 +3,7 @@ import Dispatch
 func whenAll<Value>(_ promises: [Promise<Value>], notifyOn queue: DispatchQueue = .global()) -> Promise<[Value]> {
   return Promise { (fulfill, reject) in
     let group = DispatchGroup()
+    var rejected = false
 
     for promise in promises {
       group.enter()
@@ -11,11 +12,15 @@ func whenAll<Value>(_ promises: [Promise<Value>], notifyOn queue: DispatchQueue
         group.leave()
       }.catch { error in
         reject(error)
+        rejected = true
+        group.leave()
       }
     }
 
     group.notify(queue: queue) {
-      fulfill(promises.map { $0.result!.value! })
+      if !rejected {
+        fulfill(promises.map { $0.result!.value! })
+      }
     }
   }
 }

diff --git a/Sources/Apollo/ResultOrPromise.swift b/Sources/Apollo/ResultOrPromise.swift
@@ -19,6 +19,7 @@ func whenAll<Value>(_ resultsOrPromises: [ResultOrPromise<Value>], notifyOn queu
 
   return .promise(Promise { (fulfill, reject) in
     let group = DispatchGroup()
+    var rejected = false
 
     for resultOrPromise in resultsOrPromises {
       group.enter()
@@ -27,11 +28,15 @@ func whenAll<Value>(_ resultsOrPromises: [ResultOrPromise<Value>], notifyOn queu
         group.leave()
       }.catch { error in
         reject(error)
+        rejected = true
+        group.leave()
       }
     }
 
     group.notify(queue: queue) {
-      fulfill(resultsOrPromises.map { $0.result!.value! })
+      if !rejected {
+        fulfill(resultsOrPromises.map { $0.result!.value! })
+      }
     }
   })
 }