Snap for 6007460 from 439b0fad1d24972948f96f58a8931ebe72d0ab29 to rvc-releaseandroid-vts-11.0_r1android-cts-11.0_r1android-11.0.0_r3android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-releaseandroid11-gsi

Change-Id: I9a1e2a6c265edb6444d97292b56b6018181c7f55

1 files changed, 9 insertions, 5 deletions

diff --git a/Rx/v2/src/rxcpp/rx-observable.hpp b/Rx/v2/src/rxcpp/rx-observable.hpp
index 4f42007..7e3d567 100644
--- a/Rx/v2/src/rxcpp/rx-observable.hpp
+++ b/Rx/v2/src/rxcpp/rx-observable.hpp
@@ -174,22 +174,26 @@ class blocking_observable
         std::mutex lock;
         std::condition_variable wake;
         bool disposed = false;
-        rxu::error_ptr error;
 
         auto dest = make_subscriber<T>(std::forward<ArgN>(an)...);
 
+        rxu::error_ptr error;
+        bool has_error = false;
+
         // keep any error to rethrow at the end.
+        // copy 'dest' by-value to avoid using it after it goes out of scope.
         auto scbr = make_subscriber<T>(
             dest,
-            [&](T t){dest.on_next(t);},
-            [&](rxu::error_ptr e){
+            [dest](T t){dest.on_next(t);},
+            [dest,&error,&has_error,do_rethrow](rxu::error_ptr e){
                 if (do_rethrow) {
+                    has_error = true;
                     error = e;
                 } else {
                     dest.on_error(e);
                 }
             },
-            [&](){dest.on_completed();}
+            [dest](){dest.on_completed();}
             );
 
         auto cs = scbr.get_subscription();
@@ -208,7 +212,7 @@ class blocking_observable
                 return disposed;
             });
 
-        if (error) {rxu::rethrow_exception(error);}
+        if (has_error) {rxu::rethrow_exception(error);}
     }
 
 public: