fix(ios): thread race of bundle load op in very small scenarios

Tencent · Oct 12, 2024 · 543c5b4 · 543c5b4
1 parent 26a9d93
commit 543c5b4
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/framework/ios/base/bridge/HippyBridge.mm b/framework/ios/base/bridge/HippyBridge.mm
@@ -183,7 +183,7 @@ @interface HippyBridge() {
 /// Bundle fetch operation queue (concurrent)
 @property (nonatomic, strong) NSOperationQueue *bundleQueue;
 /// Record the last execute operation for adding execution dependency.
-@property (atomic, strong, nullable) NSOperation *lastExecuteOperation;
+@property (nonatomic, strong, nullable) NSOperation *lastExecuteOperation;
 
 /// Cached Dimensions info，will be passed to JS Side.
 @property (atomic, strong) NSDictionary *cachedDimensionsInfo;
@@ -591,13 +591,17 @@ - (void)beginLoadingBundle:(NSURL *)bundleURL
                                 strongSelf.valid, script];
             HippyLogError(@"%@", errMsg);
             completion(bundleURL, HippyErrorWithMessage(errMsg));
-            strongSelf.lastExecuteOperation = nil;
+            @synchronized (self) {
+                strongSelf.lastExecuteOperation = nil;
+            }
             return;
         }
         [strongSelf executeJSCode:script sourceURL:bundleURL onCompletion:^(id result, NSError *error) {
             HippyLogInfo(@"End executing bundle(%s)",
                          HP_CSTR_NOT_NULL(bundleURL.absoluteString.lastPathComponent.UTF8String));
-            strongSelf.lastExecuteOperation = nil;
+            @synchronized (self) {
+                strongSelf.lastExecuteOperation = nil;
+            }
             if (completion) {
                 completion(bundleURL, error);
             }
@@ -624,13 +628,18 @@ - (void)beginLoadingBundle:(NSURL *)bundleURL
     // Add dependency, make sure that doing fetch before execute,
     // and all execution operations must be queued.
     [executeOperation addDependency:fetchOperation];
-    if (self.lastExecuteOperation) {
-        [executeOperation addDependency:self.lastExecuteOperation];
+    @synchronized (self) {
+        NSOperation *lastOp = self.lastExecuteOperation;
+        if (lastOp) {
+            [executeOperation addDependency:lastOp];
+        }
     }
 
     // Enqueue operation
     [_bundleQueue addOperations:@[fetchOperation, executeOperation] waitUntilFinished:NO];
-    self.lastExecuteOperation = executeOperation;
+    @synchronized (self) {
+        self.lastExecuteOperation = executeOperation;
+    }
 }
 
 - (void)unloadInstanceForRootView:(NSNumber *)rootTag {