Fix potential race during client initialization (#4091) (#4102)

Author: wilhuff

Firestore/CHANGELOG.md

@@ -1,7 +1,8 @@
 # Unreleased
 
 # v1.6.1
-- [changed] Internal improvements.
+- [fixed] Fix a race condition that could cause a segmentation fault during
+  client initialization.
 
 # v1.6.0
 - [feature] Added an `addSnapshotsInSyncListener()` method to

Firestore/core/src/firebase/firestore/core/firestore_client.h

@@ -207,6 +207,7 @@ class FirestoreClient : public std::enable_shared_from_this<FirestoreClient> {
   std::chrono::milliseconds initial_gc_delay_ = std::chrono::minutes(1);
   std::chrono::milliseconds regular_gc_delay_ = std::chrono::minutes(5);
   bool gc_has_run_ = false;
+  bool credentials_initialized_ = false;
   local::LruDelegate* _Nullable lru_delegate_;
   util::DelayedOperation lru_callback_;
 };

Firestore/core/src/firebase/firestore/core/firestore_client.mm

@@ -94,18 +94,21 @@
       new FirestoreClient(database_info, std::move(credentials_provider),
                           std::move(user_executor), std::move(worker_queue)));
 
-  auto user_promise = std::make_shared<std::promise<User>>();
-  bool credentials_initialized = false;
-
   std::weak_ptr<FirestoreClient> weak_client(shared_client);
-  auto credential_change_listener = [credentials_initialized, user_promise,
-                                     weak_client](User user) mutable {
+  auto credential_change_listener = [weak_client, settings](User user) mutable {
     auto shared_client = weak_client.lock();
     if (!shared_client) return;
 
-    if (!credentials_initialized) {
-      credentials_initialized = true;
-      user_promise->set_value(user);
+    if (!shared_client->credentials_initialized_) {
+      shared_client->credentials_initialized_ = true;
+
+      // When we register the credentials listener for the first time,
+      // it is invoked synchronously on the calling thread. This ensures that
+      // the first item enqueued on the worker queue is
+      // `FirestoreClient::Initialize()`.
+      shared_client->worker_queue()->Enqueue([shared_client, user, settings] {
+        shared_client->Initialize(user, settings);
+      });
     } else {
       shared_client->worker_queue()->Enqueue([shared_client, user] {
         shared_client->worker_queue()->VerifyIsCurrentQueue();
@@ -119,15 +122,9 @@ new FirestoreClient(database_info, std::move(credentials_provider),
   shared_client->credentials_provider_->SetCredentialChangeListener(
       credential_change_listener);
 
-  // Defer initialization until we get the current user from the
-  // credential_change_listener. This is guaranteed to be synchronously
-  // dispatched onto our worker queue, so we will be initialized before any
-  // subsequently queued work runs.
-  shared_client->worker_queue()->Enqueue(
-      [shared_client, user_promise, settings] {
-        User user = user_promise->get_future().get();
-        shared_client->Initialize(user, settings);
-      });
+  HARD_ASSERT(
+      shared_client->credentials_initialized_,
+      "CredentialChangeListener not invoked during client initialization");
 
   return shared_client;
 }