CBL-5035 : Fix not initializing pending conflict array (#3200)

couchbase · Nov 11, 2023 · 0f33a19 · 0f33a19
1 parent 9f194b8
commit 0f33a19
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Objective-C/CBLReplicator.mm b/Objective-C/CBLReplicator.mm
@@ -104,6 +104,7 @@ - (instancetype) initWithConfig: (CBLReplicatorConfiguration *)config {
         _progressLevel = kCBLProgressLevelOverall;
         _changeNotifier = [CBLChangeNotifier new];
         _docReplicationNotifier = [CBLChangeNotifier new];
+        _pendingConflicts = [NSMutableArray array];
         _status = [[CBLReplicatorStatus alloc] initWithStatus: {kC4Stopped, {}, {}}];
 
         NSString* qName = self.description;
@@ -670,7 +671,7 @@ - (void) logErrorOnDocument: (CBLReplicatedDocument*)doc pushing: (BOOL)pushing
 
 // Called inside the lock
 - (void) scheduleConflictResolutionForDocument: (CBLReplicatedDocument*)doc {
-    if (_conflictResolutionSuspended) {
+    if (_conflictResolutionSuspended || _state == kCBLStateStopped) {
         return;
     }