Add safeguards against mutation of OCCore._queries during enumeration.

owncloud · Jul 28, 2021 · f9d7fd3 · f9d7fd3
1 parent 8083bbd
commit f9d7fd3
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 6 deletions.
diff --git a/ownCloudSDK/Core/Connection Status/OCCore+ConnectionStatus.m b/ownCloudSDK/Core/Connection Status/OCCore+ConnectionStatus.m
@@ -328,7 +328,13 @@ - (void)updateConnectionStatus:(OCCoreConnectionStatus)newStatus withSignal:(OCC
 					[self queueBlock:^{ // See if we can proceed
 						if (self->_state == OCCoreStateRunning)
 						{
-							for (OCQuery *query in self->_queries)
+							NSArray *queries;
+							@synchronized(self->_queries)
+							{
+								queries = [self->_queries copy];
+							}
+
+							for (OCQuery *query in queries)
 							{
 								if (query.state == OCQueryStateContentsFromCache)
 								{

diff --git a/ownCloudSDK/Core/ItemList/OCCore+ItemList.m b/ownCloudSDK/Core/ItemList/OCCore+ItemList.m
@@ -1025,7 +1025,14 @@ - (void)_finalizeQueryUpdatesWithQueryResults:(NSMutableArray<OCItem *> *)queryR
 	}
 
 	// Update queries
-	for (OCQuery *query in self->_queries)
+	NSArray *queries;
+
+	@synchronized(self->_queries)
+	{
+		queries = [self->_queries copy];
+	}
+
+	for (OCQuery *query in queries)
 	{
 		NSMutableArray <OCItem *> *useQueryResults = nil;
 		OCItem *queryRootItem = nil;

diff --git a/ownCloudSDK/Core/OCCore+ItemUpdates.m b/ownCloudSDK/Core/OCCore+ItemUpdates.m
@@ -223,7 +223,13 @@ - (void)performUpdatesForAddedItems:(nullable NSArray<OCItem *> *)addedItems
 				}
 			};
 
-			for (OCQuery *query in self->_queries)
+			NSArray *queries;
+			@synchronized(self->_queries)
+			{
+				queries = [self->_queries copy];
+			}
+
+			for (OCQuery *query in queries)
 			{
 				// Protect full query results against modification (-setFullQueryResults: is protected using @synchronized(query), too)
 				@synchronized(query)

diff --git a/ownCloudSDK/Core/OCCore.m b/ownCloudSDK/Core/OCCore.m
@@ -820,7 +820,10 @@ - (void)startQuery:(OCCoreQuery *)coreQuery
 	{
 		// Add query to list of queries
 		[self queueBlock:^{
-			[self->_queries addObject:query];
+			@synchronized(self->_queries)
+			{
+				[self->_queries addObject:query];
+			}
 		}];
 
 		if (!query.isCustom)
@@ -889,7 +892,10 @@ - (void)stopQuery:(OCCoreQuery *)coreQuery
 			[query.stopAction cancel];
 
 			query.state = OCQueryStateStopped;
-			[self->_queries removeObject:query];
+			@synchronized(self->_queries)
+			{
+				[self->_queries removeObject:query];
+			}
 		}];
 	}
 
@@ -1101,7 +1107,14 @@ - (void)_replayChangesSinceSyncAnchor:(OCSyncAnchor)fromSyncAnchor
 				newSyncAnchor:syncAnchor
 				beforeQueryUpdates:^(dispatch_block_t  _Nonnull completionHandler) {
 					// Find items that moved to a different path
-					for (OCQuery *query in self->_queries)
+					NSArray *queries;
+
+					@synchronized(self->_queries)
+					{
+						queries = [self->_queries copy];
+					}
+
+					for (OCQuery *query in queries)
 					{
 						OCCoreItemList *queryItemList;