Handle nil node blocks gracefully in production (#2338)

facebookarchive · Oct 4, 2016 · 79a6c66 · 79a6c66
1 parent adcb75f
commit 79a6c66
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AsyncDisplayKit/ASCollectionView.mm b/AsyncDisplayKit/ASCollectionView.mm
@@ -965,7 +965,7 @@ - (ASCellNodeBlock)dataController:(ASDataController *)dataController nodeBlockAt
   return ^{
     __typeof__(self) strongSelf = weakSelf;
 
-    ASCellNode *node = block();
+    ASCellNode *node = (block != nil ? block() : [[ASCellNode alloc] init]);
     [node enterHierarchyState:ASHierarchyStateRangeManaged];
     if (node.interactionDelegate == nil) {
       node.interactionDelegate = strongSelf;

diff --git a/AsyncDisplayKit/ASTableView.mm b/AsyncDisplayKit/ASTableView.mm
@@ -1140,10 +1140,11 @@ - (ASCellNodeBlock)dataController:(ASDataController *)dataController nodeBlockAt
   }
 
   ASCellNodeBlock block = [_asyncDataSource tableView:self nodeBlockForRowAtIndexPath:indexPath];
+  ASDisplayNodeAssertNotNil(block, @"Invalid block, expected nonnull ASCellNodeBlock");
   __weak __typeof__(self) weakSelf = self;
   ASCellNodeBlock configuredNodeBlock = ^{
     __typeof__(self) strongSelf = weakSelf;
-    ASCellNode *node = block();
+    ASCellNode *node = (block != nil ? block() : [[ASCellNode alloc] init]);
     [node enterHierarchyState:ASHierarchyStateRangeManaged];
     if (node.interactionDelegate == nil) {
       node.interactionDelegate = strongSelf;