patch of fix #893

Author: zxu123

Firestore/Source/Local/FSTLevelDBMutationQueue.mm

@@ -94,7 +94,7 @@ @implementation FSTLevelDBMutationQueue {
 + (instancetype)mutationQueueWithUser:(const User &)user
                                    db:(std::shared_ptr<DB>)db
                            serializer:(FSTLocalSerializer *)serializer {
-  NSString *userID = user.is_authenticated() ? util::WrapNSStringNoCopy(user.uid()) : @"";
+  NSString *userID = user.is_authenticated() ? util::WrapNSString(user.uid()) : @"";
 
   return [[FSTLevelDBMutationQueue alloc] initWithUserID:userID db:db serializer:serializer];
 }
@@ -103,7 +103,7 @@ - (instancetype)initWithUserID:(NSString *)userID
                             db:(std::shared_ptr<DB>)db
                     serializer:(FSTLocalSerializer *)serializer {
   if (self = [super init]) {
-    _userID = userID;
+    _userID = [userID copy];
     _db = db;
     _serializer = serializer;
   }

Firestore/Source/Remote/FSTDatastore.mm

@@ -97,7 +97,7 @@ - (instancetype)initWithDatabaseInfo:(const DatabaseInfo *)databaseInfo
                          credentials:(CredentialsProvider *)credentials {
   if (self = [super init]) {
     _databaseInfo = databaseInfo;
-    NSString *host = util::WrapNSStringNoCopy(databaseInfo->host());
+    NSString *host = util::WrapNSString(databaseInfo->host());
     if (!databaseInfo->ssl_enabled()) {
       GRPCHost *hostConfig = [GRPCHost hostWithAddress:host];
       hostConfig.secure = NO;

Firestore/Source/Remote/FSTSerializerBeta.mm

@@ -152,8 +152,8 @@ - (FSTResourcePath *)decodedQueryPath:(NSString *)name {
 
 - (FSTResourcePath *)encodedResourcePathForDatabaseID:(const DatabaseId *)databaseID {
   return [FSTResourcePath pathWithSegments:@[
-    @"projects", util::WrapNSStringNoCopy(databaseID->project_id()), @"databases",
-    util::WrapNSStringNoCopy(databaseID->database_id())
+    @"projects", util::WrapNSString(databaseID->project_id()), @"databases",
+    util::WrapNSString(databaseID->database_id())
   ]];
 }
 

Firestore/Source/Remote/FSTStream.mm

@@ -632,7 +632,7 @@ - (instancetype)initWithDatabase:(const DatabaseInfo *)database
 }
 
 - (GRPCCall *)createRPCWithRequestsWriter:(GRXWriter *)requestsWriter {
-  return [[GRPCCall alloc] initWithHost:util::WrapNSStringNoCopy(self.databaseInfo->host())
+  return [[GRPCCall alloc] initWithHost:util::WrapNSString(self.databaseInfo->host())
                                    path:@"/google.firestore.v1beta1.Firestore/Listen"
                          requestsWriter:requestsWriter];
 }
@@ -717,7 +717,7 @@ - (instancetype)initWithDatabase:(const DatabaseInfo *)database
 }
 
 - (GRPCCall *)createRPCWithRequestsWriter:(GRXWriter *)requestsWriter {
-  return [[GRPCCall alloc] initWithHost:util::WrapNSStringNoCopy(self.databaseInfo->host())
+  return [[GRPCCall alloc] initWithHost:util::WrapNSString(self.databaseInfo->host())
                                    path:@"/google.firestore.v1beta1.Firestore/Write"
                          requestsWriter:requestsWriter];
 }