Merge pull request #1063 from IntelexTechnologies/intelex-master

RNFSManager:readDir iOS crash fix
itinance · Feb 18, 2022 · 6b22f62 · 6b22f62
2 parents 01952b4 + e9a5155
commit 6b22f62
Showing 1 changed file with 14 additions and 13 deletions.
diff --git a/RNFSManager.m b/RNFSManager.m
@@ -57,26 +57,27 @@ + (BOOL)requiresMainQueueSetup
   NSError *error = nil;
 
   NSArray *contents = [fileManager contentsOfDirectoryAtPath:dirPath error:&error];
-
-  contents = [contents rnfs_mapObjectsUsingBlock:^id(NSString *obj, NSUInteger idx) {
+  NSMutableArray *tagetContents = [[NSMutableArray alloc] init];
+  for (NSString *obj in contents) {
     NSString *path = [dirPath stringByAppendingPathComponent:obj];
     NSDictionary *attributes = [fileManager attributesOfItemAtPath:path error:nil];
-
-    return @{
-             @"ctime": [self dateToTimeIntervalNumber:(NSDate *)[attributes objectForKey:NSFileCreationDate]],
-             @"mtime": [self dateToTimeIntervalNumber:(NSDate *)[attributes objectForKey:NSFileModificationDate]],
-             @"name": obj,
-             @"path": path,
-             @"size": [attributes objectForKey:NSFileSize],
-             @"type": [attributes objectForKey:NSFileType]
-             };
-  }];
+    if(attributes != nil) {
+        [tagetContents addObject:@{
+            @"ctime": [self dateToTimeIntervalNumber:(NSDate *)[attributes objectForKey:NSFileCreationDate]],
+            @"mtime": [self dateToTimeIntervalNumber:(NSDate *)[attributes objectForKey:NSFileModificationDate]],
+            @"name": obj,
+            @"path": path,
+            @"size": [attributes objectForKey:NSFileSize],
+            @"type": [attributes objectForKey:NSFileType]
+            }];
+    }
+  }
 
   if (error) {
     return [self reject:reject withError:error];
   }
 
-  resolve(contents);
+  resolve(tagetContents);
 }
 
 RCT_EXPORT_METHOD(exists:(NSString *)filepath