fix(ios): fix some issues (#1679)

* fix(ios): fix a deadlock issue for module data * fix(ios): fix data race in batched bridge
Tencent · Mar 29, 2022 · 8a88f0a · 8a88f0a
1 parent 3e15f5c
commit 8a88f0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ios/sdk/base/HippyBatchedBridge.mm b/ios/sdk/base/HippyBatchedBridge.mm
@@ -1126,13 +1126,14 @@ - (id)callNativeModule:(NSUInteger)moduleID method:(NSUInteger)methodID params:(
             return nil;
         }
     }
-    if (methodID >= [moduleData.methods count]) {
+    NSArray<id<HippyBridgeMethod>> *methods = [moduleData.methods copy];
+    if (methodID >= [methods count]) {
         if (_valid) {
-            HippyLogError(@"methodID %lu exceed range of moduleData.methods %lu, bridge is valid %ld", moduleID, [moduleData.methods count], (long)_valid);
+            HippyLogError(@"methodID %lu exceed range of moduleData.methods %lu, bridge is valid %ld", moduleID, [methods count], (long)_valid);
         }
         return nil;
     }
-    id<HippyBridgeMethod> method = moduleData.methods[methodID];
+    id<HippyBridgeMethod> method = methods[methodID];
     if (HIPPY_DEBUG && !method) {
         if (_valid) {
             HippyLogError(@"Unknown methodID: %lu for module: %lu (%@)", (unsigned long)methodID, (unsigned long)moduleID, moduleData.name);

diff --git a/ios/sdk/base/HippyModuleData.mm b/ios/sdk/base/HippyModuleData.mm
@@ -337,8 +337,8 @@ - (void)setMethodQueue:(dispatch_queue_t)methodQueue {
 }
 
 - (dispatch_queue_t)methodQueue {
+    [self instance];
     @synchronized(self) {
-        [self instance];
         return _methodQueue;
     }
 }