Skip to content

Commit ca5e7bc

Browse files
Initialize module-class registry in RCTGetModuleClasses (#60119)
Summary: `RCTModuleClasses` and `RCTModuleClassesSyncQueue` were only created inside `RCTRegisterModule`. When `RCT_REMOVE_LEGACY_COMPONENT_INTEROP` is defined, `RCTViewManager` is no longer registered through `RCTRegisterModule`, so an app with no other legacy modules registered this way never creates the queue. `RCTGetModuleClasses()` then calls `dispatch_sync(NULL, ...)` during `RCTHost` start and crashes with SIGSEGV. This moves the one-time initialization into `RCTEnsureModuleClassesRegistry()`, which both `RCTGetModuleClasses` and `RCTRegisterModule` call. With no registered modules, `RCTGetModuleClasses` now returns an empty array. No visible UI change. ## Changelog: [iOS][Fixed] - Fix crash in `RCTGetModuleClasses` when no legacy modules have been registered (e.g. with `RCT_REMOVE_LEGACY_COMPONENT_INTEROP`) Differential Revision: D132788274 Pull Request resolved: #60119
1 parent 55e061e commit ca5e7bc

1 file changed

Lines changed: 15 additions & 6 deletions

File tree

‎packages/react-native/React/Base/RCTBridge.mm‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,22 @@
3030
#if !defined(RCT_REMOVE_LEGACY_MODULE_INTEROP) || !defined(RCT_REMOVE_LEGACY_COMPONENT_INTEROP)
3131
static NSMutableArray<Class> *RCTModuleClasses;
3232
static dispatch_queue_t RCTModuleClassesSyncQueue;
33+
34+
// RCTGetModuleClasses may run before (or without) any RCTRegisterModule call, e.g. in
35+
// apps that register no legacy modules, so both entry points must initialize the registry.
36+
static void RCTEnsureModuleClassesRegistry()
37+
{
38+
static dispatch_once_t onceToken;
39+
dispatch_once(&onceToken, ^{
40+
RCTModuleClasses = [NSMutableArray new];
41+
RCTModuleClassesSyncQueue =
42+
dispatch_queue_create("com.facebook.react.ModuleClassesSyncQueue", DISPATCH_QUEUE_CONCURRENT);
43+
});
44+
}
45+
3346
NSArray<Class> *RCTGetModuleClasses(void)
3447
{
48+
RCTEnsureModuleClassesRegistry();
3549
__block NSArray<Class> *result;
3650
dispatch_sync(RCTModuleClassesSyncQueue, ^{
3751
result = [RCTModuleClasses copy];
@@ -141,12 +155,7 @@ void RCTRegisterModule(Class moduleClass)
141155
if (RCTAreLegacyLogsEnabled() && ![getCoreModuleClasses() containsObject:[moduleClass description]]) {
142156
addModuleLoadedWithOldArch([moduleClass description]);
143157
}
144-
static dispatch_once_t onceToken;
145-
dispatch_once(&onceToken, ^{
146-
RCTModuleClasses = [NSMutableArray new];
147-
RCTModuleClassesSyncQueue =
148-
dispatch_queue_create("com.facebook.react.ModuleClassesSyncQueue", DISPATCH_QUEUE_CONCURRENT);
149-
});
158+
RCTEnsureModuleClassesRegistry();
150159

151160
RCTAssert(
152161
[moduleClass conformsToProtocol:@protocol(RCTBridgeModule)],

0 commit comments

Comments
 (0)