Use module copies in RCTBridge APIs

Summary: This array can be modified while it's being iterated, so we need to take a copy. I also found another crash and guarded against it. Reviewed By: fkgozali Differential Revision: D8955708 fbshipit-source-id: 76250bc5d451776e74505733c0f3c14e555fb576
facebook · Jul 23, 2018 · 3d8b839 · 3d8b839
1 parent ccdd450
commit 3d8b839
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
@@ -246,7 +246,7 @@ - (id)moduleForClass:(Class)moduleClass
 - (NSArray *)modulesConformingToProtocol:(Protocol *)protocol
 {
   NSMutableArray *modules = [NSMutableArray new];
-  for (Class moduleClass in self.moduleClasses) {
+  for (Class moduleClass in [self.moduleClasses copy]) {
     if ([moduleClass conformsToProtocol:protocol]) {
       id module = [self moduleForClass:moduleClass];
       if (module) {

diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
@@ -544,8 +544,9 @@ - (void)_initializeBridge:(std::shared_ptr<JSExecutorFactory>)executorFactory
   RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways,
                           @"-[RCTCxxBridge initModulesWithDispatchGroup:] autoexported moduleData", nil);
 
-  NSMutableArray<RCTModuleData *> *moduleDataByID = [NSMutableArray arrayWithCapacity:moduleClasses.count];
-  for (Class moduleClass in moduleClasses) {
+  NSArray *moduleClassesCopy = [moduleClasses copy];
+  NSMutableArray<RCTModuleData *> *moduleDataByID = [NSMutableArray arrayWithCapacity:moduleClassesCopy.count];
+  for (Class moduleClass in moduleClassesCopy) {
     NSString *moduleName = RCTBridgeModuleNameForClass(moduleClass);
 
     // Check for module name collisions