From 6770b53f8d064a6d14cbd8dd8dcfdc27ac98deb0 Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Fri, 2 Nov 2018 11:23:40 -0700
Subject: [PATCH] Added lock around RN module initialization to fix crash

Summary:
T35879909 is a UBN caused by a race condition in RN initialization. I haven't been able to repro, but the crash logs point to a bad memory access in this method. Another thread must be deallocating something concurrently.

This is a quick fix to patch into v197.

Reviewed By: fkgozali

Differential Revision: D12904277

fbshipit-source-id: 5740183f9a7c8f2c45ca627662891cb0c1048764
---
 React/CxxBridge/RCTCxxBridge.mm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 29d5361bd56..5d6ccf94e9c 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -706,9 +706,11 @@ struct RCTInstanceCallback : public InstanceCallback {
 
 - (void)registerAdditionalModuleClasses:(NSArray<Class> *)modules
 {
-  NSArray<RCTModuleData *> *newModules = [self _initializeModules:modules withDispatchGroup:NULL lazilyDiscovered:YES];
-  if (_reactInstance) {
-    _reactInstance->getModuleRegistry().registerModules(createNativeModules(newModules, self, _reactInstance));
+  @synchronized (self) {
+    NSArray<RCTModuleData *> *newModules = [self _initializeModules:modules withDispatchGroup:NULL lazilyDiscovered:YES];
+    if (_reactInstance) {
+      _reactInstance->getModuleRegistry().registerModules(createNativeModules(newModules, self, _reactInstance));
+    }
   }
 }