Skip to content

fix: prevent crash when transactionId is nil in transactionBegin #8715

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent crash when transactionId is nil in transactionBegin #8715

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
18 changes: 16 additions & 2 deletions packages/firestore/ios/RNFBFirestore/RNFBFirestoreTransactionModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,12 @@ - (void)invalidate {
: (FIRApp *)firebaseApp
: (NSString *)databaseId
: (nonnull NSNumber *)transactionId) {
// Validate transactionId to prevent crash
if (transactionId == nil) {
DLog(@"Error: transactionId is nil in transactionBegin");
return;
}

FIRFirestore *firestore = [RNFBFirestoreCommon getFirestoreForApp:firebaseApp
databaseId:databaseId];
__block BOOL aborted = false;
Expand All @@ -152,8 +158,16 @@ - (void)invalidate {
transactionState[@"semaphore"] = semaphore;
transactionState[@"transaction"] = transaction;

if (!transactions[[transactionId stringValue]]) {
transactions[[transactionId stringValue]] = transactionState;
// Safe dictionary key handling
NSString *transactionKey = [transactionId stringValue];
if (transactionKey != nil && !transactions[transactionKey]) {
transactions[transactionKey] = transactionState;
} else {
DLog(@"Invalid transactionId provided: %@", transactionId);
*errorPointer = [NSError errorWithDomain:FIRFirestoreErrorDomain
code:FIRFirestoreErrorCodeInvalidArgument
userInfo:@{NSLocalizedDescriptionKey: @"Invalid transaction ID"}];
return nil;
}

// build and send transaction update event
Expand Down
Loading