status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-22 14:18:23 +00:00
Code Issues Projects Releases Wiki Activity

Added lock around RN module initialization to fix crash

Browse Source 
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
This commit is contained in:
Peter Argany 2018-11-02 11:23:40 -07:00 committed by Facebook Github Bot
parent 28de61e9f0
commit 6770b53f8d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
React/CxxBridge/RCTCxxBridge.mm
View File

@ -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));
}
}
}