Skip to content

Copy all C++ strings to NSString where they're not obviously safe #893

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Mar 8, 2018
Merged

Copy all C++ strings to NSString where they're not obviously safe #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Firestore/Source/Local/FSTLevelDBMutationQueue.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
}
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Source/Remote/FSTDatastore.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ - (instancetype)initWithDatabaseInfo:(const DatabaseInfo *)databaseInfo
credentials:(id<FSTCredentialsProvider>)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;
Expand Down
4 changes: 2 additions & 2 deletions Firestore/Source/Remote/FSTSerializerBeta.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,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())
]];
}

Expand Down
4 changes: 2 additions & 2 deletions Firestore/Source/Remote/FSTStream.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,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];
}
Expand Down Expand Up @@ -714,7 +714,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];
}
Expand Down