Fix assersion failure when moving objects between sections

Roobiq · Jun 2, 2016 · e8e4022 · e8e4022
1 parent 7426d08
commit e8e4022
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/RBQFetchedResultsController/Source/RBQFetchedResultsController.m b/RBQFetchedResultsController/Source/RBQFetchedResultsController.m
@@ -655,7 +655,7 @@ - (NSSet *)safeObjectsFromChanges:(NSArray<NSNumber *> *)changes
             safeObject = [RBQSafeRealmObject safeObjectFromObject:object];
         }
         else {
-            NSPredicate *predicate = [NSPredicate predicateWithFormat:@"firstObjectIndex <= %@ AND lastObjectIndex >= %@", index, index];
+            NSPredicate *predicate = [NSPredicate predicateWithFormat:@"firstObjectIndex <= %@ AND lastObjectIndex >= %@ AND objects.@count > 0", index, index];
             RLMResults *sections = [RBQSectionCacheObject objectsInRealm:cacheRealm withPredicate:predicate];
             RBQSectionCacheObject *section = sections.firstObject;
             NSUInteger row = index.unsignedIntegerValue - section.firstObjectIndex;
@@ -891,7 +891,7 @@ - (void)applyDerivedChangesToCache:(RBQDerivedChangesObject *)derivedChanges
     for (NSOrderedSet *objectChanges in @[derivedChanges.deletedObjectChanges,
                                           derivedChanges.insertedObjectChanges,
                                           derivedChanges.movedObjectChanges]) {
-        
+
         for (RBQObjectChangeObject *objectChange in objectChanges) {
 
             if (objectChange.changeType == NSFetchedResultsChangeDelete) {
@@ -915,12 +915,12 @@ - (void)applyDerivedChangesToCache:(RBQDerivedChangesObject *)derivedChanges
                 RBQSectionCacheObject *section =
                 [RBQSectionCacheObject objectInRealm:state.cacheRealm
                                        forPrimaryKey:objectChange.updatedCacheObject.sectionKeyPathValue];
-
-#ifdef DEBUG
-                NSAssert(objectChange.updatedIndexpath.row <= section.objects.count, @"Attemting to insert at index beyond bounds!");
-#endif
+                NSInteger insertIndex = objectChange.updatedIndexpath.row;
+                if (insertIndex >= section.objects.count) {
+                    insertIndex = section.objects.count - 1;
+                }
                 [section.objects insertObject:objectChange.updatedCacheObject
-                                      atIndex:objectChange.updatedIndexpath.row];
+                                      atIndex:insertIndex];
 
                 objectChange.updatedCacheObject.section = section;
             }