Merge branch 'main' into pb-rtdb-file-protection

Author: paulb777

FirebaseAuth/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 - [fixed] Add a mechanism to prevent concurrent token refreshes. (#15474)
+- [fixed] Fix "weak never mutated" build warning introduced in Xcode 26.2.
 
 # 12.2.0
 - [added] Added TOTP support for macOS.

FirebaseAuth/Sources/Swift/Auth/Auth.swift

@@ -1938,30 +1938,30 @@ extension Auth: AuthInterop {
         "for the new token.")
     }
     autoRefreshScheduled = true
-    weak var weakSelf = self
-    authDispatcher.dispatch(afterDelay: delay, queue: kAuthGlobalWorkQueue) {
-      guard let strongSelf = weakSelf else {
+    authDispatcher.dispatch(afterDelay: delay, queue: kAuthGlobalWorkQueue) { [weak self] in
+      guard let self else {
         return
       }
-      guard strongSelf._currentUser?.rawAccessToken() == accessToken else {
+      guard self._currentUser?.rawAccessToken() == accessToken else {
         // Another auto refresh must have been scheduled, so keep _autoRefreshScheduled unchanged.
         return
       }
-      strongSelf.autoRefreshScheduled = false
-      if strongSelf.isAppInBackground {
+      self.autoRefreshScheduled = false
+      if self.isAppInBackground {
         return
       }
-      let uid = strongSelf._currentUser?.uid
-      strongSelf._currentUser?
-        .internalGetToken(forceRefresh: true, backend: strongSelf.backend) { token, error in
-          if strongSelf._currentUser?.uid != uid {
+      let uid = self._currentUser?.uid
+      self._currentUser?
+        .internalGetToken(forceRefresh: true, backend: self.backend) { [weak self] token, error in
+          guard let self else { return }
+          if self._currentUser?.uid != uid {
             return
           }
           if error != nil {
             // Kicks off exponential back off logic to retry failed attempt. Starts with one minute
             // delay (60 seconds) if this is the first failed attempt.
             let rescheduleDelay = retry ? min(delay * 2, 16 * 60) : 60
-            strongSelf.scheduleAutoTokenRefresh(withDelay: rescheduleDelay, retry: true)
+            self.scheduleAutoTokenRefresh(withDelay: rescheduleDelay, retry: true)
           }
         }
     }

FirebaseDatabase/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 - [fixed] Fix `Fatal Exception: FirebaseDatabasePersistenceFailure`. (#4493)
+- [fixed] Concurrency crash in FView. (#15514)
 
 # 11.9.0
 - [fixed] Fix connection failure issue introduced in 10.27.0 by restoring the

FirebaseDatabase/Sources/Core/View/FView.m

@@ -70,6 +70,8 @@ @interface FView ()
 @property(nonatomic, strong, readwrite) FQuerySpec *query;
 @property(nonatomic, strong) FViewProcessor *processor;
 @property(nonatomic, strong) FViewCache *viewCache;
+
+// All accesses must be guarded by @synchronized(self.eventRegistrations)
 @property(nonatomic, strong) NSMutableArray *eventRegistrations;
 @property(nonatomic, strong) FEventGenerator *eventGenerator;
 
@@ -165,11 +167,15 @@ - (id)initWithQuery:(FQuerySpec *)query
 }
 
 - (BOOL)isEmpty {
-    return self.eventRegistrations.count == 0;
+    @synchronized(self.eventRegistrations) {
+        return self.eventRegistrations.count == 0;
+    }
 }
 
 - (void)addEventRegistration:(id<FEventRegistration>)eventRegistration {
-    [self.eventRegistrations addObject:eventRegistration];
+    @synchronized(self.eventRegistrations) {
+        [self.eventRegistrations addObject:eventRegistration];
+    }
 }
 
 /**
@@ -181,31 +187,33 @@ - (void)addEventRegistration:(id<FEventRegistration>)eventRegistration {
 - (NSArray *)removeEventRegistration:(id<FEventRegistration>)eventRegistration
                          cancelError:(NSError *)cancelError {
     NSMutableArray *cancelEvents = [[NSMutableArray alloc] init];
-    if (cancelError != nil) {
-        NSAssert(eventRegistration == nil,
-                 @"A cancel should cancel all event registrations.");
-        FPath *path = self.query.path;
-        for (id<FEventRegistration> registration in self.eventRegistrations) {
-            FCancelEvent *maybeEvent =
-                [registration createCancelEventFromError:cancelError path:path];
-            if (maybeEvent) {
-                [cancelEvents addObject:maybeEvent];
+    @synchronized(self.eventRegistrations) {
+        if (cancelError != nil) {
+            NSAssert(eventRegistration == nil,
+                     @"A cancel should cancel all event registrations.");
+            FPath *path = self.query.path;
+            for (id<FEventRegistration> registration in self
+                     .eventRegistrations) {
+                FCancelEvent *maybeEvent =
+                    [registration createCancelEventFromError:cancelError
+                                                        path:path];
+                if (maybeEvent) {
+                    [cancelEvents addObject:maybeEvent];
+                }
             }
         }
-    }
 
-    if (eventRegistration) {
-        NSUInteger i = 0;
-        while (i < self.eventRegistrations.count) {
-            id<FEventRegistration> existing = self.eventRegistrations[i];
-            if ([existing matches:eventRegistration]) {
-                [self.eventRegistrations removeObjectAtIndex:i];
-            } else {
-                i++;
-            }
+        if (eventRegistration) {
+            NSIndexSet *indexesToRemove =
+                [self.eventRegistrations indexesOfObjectsPassingTest:^BOOL(
+                                             id<FEventRegistration> existing,
+                                             NSUInteger idx, BOOL *stop) {
+                  return [existing matches:eventRegistration];
+                }];
+            [self.eventRegistrations removeObjectsAtIndexes:indexesToRemove];
+        } else {
+            [self.eventRegistrations removeAllObjects];
         }
-    } else {
-        [self.eventRegistrations removeAllObjects];
     }
     return cancelEvents;
 }
@@ -270,7 +278,10 @@ - (NSArray *)generateEventsForChanges:(NSArray *)changes
                          registration:(id<FEventRegistration>)registration {
     NSArray *registrations;
     if (registration == nil) {
-        registrations = [[NSArray alloc] initWithArray:self.eventRegistrations];
+        @synchronized(self.eventRegistrations) {
+            registrations =
+                [[NSArray alloc] initWithArray:self.eventRegistrations];
+        }
     } else {
         registrations = [[NSArray alloc] initWithObjects:registration, nil];
     }

FirebaseDatabase/Tests/Integration/FIRDatabaseQueryTests.m

@@ -3563,7 +3563,6 @@ - (void)testListenForChildAddedWithLimitEnsureEventsFireProperly {
   WAIT_FOR(count == 3);
 }
 
-#ifdef FLAKY_TEST
 - (void)testListenForChildChangedWithLimitEnsureEventsFireProperly {
   FTupleFirebase* refs = [FTestHelpers getRandomNodePair];
   FIRDatabaseReference* writer = refs.one;
@@ -3603,7 +3602,6 @@ - (void)testListenForChildChangedWithLimitEnsureEventsFireProperly {
 
   WAIT_FOR(count == 3);
 }
-#endif
 
 - (void)testListenForChildRemovedWithLimitEnsureEventsFireProperly {
   FTupleFirebase* refs = [FTestHelpers getRandomNodePair];