fix(ios): fix a potential null pointer when waterfallview cell resuse

Tencent · Aug 1, 2022 · e50fc40 · e50fc40
1 parent cfb800d
commit e50fc40
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ios/sdk/component/waterfalllist/HippyReusableNodeCache.m b/ios/sdk/component/waterfalllist/HippyReusableNodeCache.m
@@ -40,6 +40,9 @@ - (instancetype)init {
 }
 
 - (void)enqueueItemNode:(HippyVirtualNode *)node forIdentifier:(NSString *)identifier {
+    if (!node || !identifier) {
+        return;
+    }
     NSMutableSet *set = _cache[identifier];
     if (!set) {
         set = [NSMutableSet set];

diff --git a/ios/sdk/component/waterfalllist/HippyWaterfallView.m b/ios/sdk/component/waterfalllist/HippyWaterfallView.m
@@ -345,8 +345,10 @@ - (void)collectionView:(UICollectionView *)collectionView didEndDisplayingCell:(
     [hpCell.cellView removeFromSuperview];
     HippyVirtualNode *cellNode = hpCell.node;
     NSString *reuseIdentifier = [self reuseIdentifierForIndexPath:indexPath];
-    [_reusableNodeCache enqueueItemNode:cellNode forIdentifier:reuseIdentifier];
-    hpCell.node = nil;
+    if (cellNode && reuseIdentifier) {
+        [_reusableNodeCache enqueueItemNode:cellNode forIdentifier:reuseIdentifier];
+        hpCell.node = nil;
+    }
 }
 
 - (void)itemViewForCollectionViewCell:(UICollectionViewCell *)cell indexPath:(NSIndexPath *)indexPath {