fix reported deadlock ReactiveX#555

kirkshoop · Aug 26, 2021 · 810fd3f · 810fd3f
1 parent 9002d9b
commit 810fd3f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/Rx/v2/src/rxcpp/subjects/rx-subject.hpp b/Rx/v2/src/rxcpp/subjects/rx-subject.hpp
@@ -137,14 +137,16 @@ class multicast_observer
             {
                 if (o.is_subscribed()) {
                     std::weak_ptr<binder_type> binder = b;
+                    b->completer = std::make_shared<completer_type>(b->state, b->completer, o);
+                    // must not hold lock in the case when add calls the lambda inline.
+                    guard.unlock();
                     o.add([=](){
                         auto b = binder.lock();
                         if (b) {
                             std::unique_lock<std::mutex> guard(b->state->lock);
                             b->completer = std::make_shared<completer_type>(b->state, b->completer);
                         }
                     });
-                    b->completer = std::make_shared<completer_type>(b->state, b->completer, o);
                 }
             }
             break;