fix possible fail to dispose and re-lock

ReactiveX · Oct 4, 2024 · 168f887 · 168f887
1 parent 2ba3c6a
commit 168f887
Showing 1 changed file with 25 additions and 15 deletions.
diff --git a/RxSwift/Observables/Merge.swift b/RxSwift/Observables/Merge.swift
@@ -169,20 +169,7 @@ private final class MergeLimitedSinkIter<SourceElement, SourceSequence: Observab
             self.parent.dispose()
         case .completed:
             self.parent.group.remove(for: self.disposeKey)
-            if let next = self.parent.queue.dequeue() {
-                _ = CurrentThreadScheduler.instance.schedule(()) { _ in
-                    self.parent.subscribe(next, group: self.parent.group)
-                    return self.parent.group
-                }
-            }
-            else {
-                self.parent.activeCount -= 1
-
-                if self.parent.stopped && self.parent.activeCount == 0 {
-                    self.parent.forwardOn(.completed)
-                    self.parent.dispose()
-                }
-            }
+            self.parent.dequeueNextAndSubscribe()
         }
     }
 }
@@ -239,7 +226,8 @@ private class MergeLimitedSink<SourceElement, SourceSequence: ObservableConverti
         return self.group
     }
 
-    func subscribe(_ innerSource: SourceSequence, group: CompositeDisposable) {
+    @discardableResult
+    func subscribe(_ innerSource: SourceSequence, group: CompositeDisposable) -> Disposable {
         let subscription = SingleAssignmentDisposable()
 
         let key = group.insert(subscription)
@@ -250,6 +238,28 @@ private class MergeLimitedSink<SourceElement, SourceSequence: ObservableConverti
             let disposable = innerSource.asObservable().subscribe(observer)
             subscription.setDisposable(disposable)
         }
+        return subscription
+    }
+
+    func dequeueNextAndSubscribe() {
+        if let next = queue.dequeue() {
+            // subscribing immediately can produce values immediately which can re-enter and cause stack overflows
+            let disposable = CurrentThreadScheduler.instance.schedule(()) { _ in
+                // lock again
+                self.lock.performLocked {
+                    self.subscribe(next, group: self.group)
+                }
+            }
+            _ = group.insert(disposable)
+        }
+        else {
+            activeCount -= 1
+
+            if stopped && activeCount == 0 {
+                forwardOn(.completed)
+                dispose()
+            }
+        }
     }
 
     func performMap(_ element: SourceElement) throws -> SourceSequence {