Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes stack overflow possibility with merge operators #2616

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions RxSwift/Observables/Merge.swift
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +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() {
self.parent.subscribe(next, group: 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()
}
}
}
Expand Down Expand Up @@ -236,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)
Expand All @@ -247,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 {
Expand Down
Loading