fix(ios): dangling pointer in HippyBridge when unload after invalidate

Tencent · Jun 4, 2024 · 7bf5d5a · 7bf5d5a
1 parent 04d186c
commit 7bf5d5a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/framework/ios/base/bridge/HippyBridge.mm b/framework/ios/base/bridge/HippyBridge.mm
@@ -677,8 +677,9 @@ - (void)unloadInstanceForRootView:(NSNumber *)rootTag {
         NSDictionary *param = @{@"id": rootTag};
         footstone::value::HippyValue value = [param toHippyValue];
         std::shared_ptr<footstone::value::HippyValue> domValue = std::make_shared<footstone::value::HippyValue>(value);
-        self.javaScriptExecutor.pScope->UnloadInstance(domValue);
-
+        if (self.javaScriptExecutor) {
+            self.javaScriptExecutor.pScope->UnloadInstance(domValue);
+        }
         _renderManager->UnregisterRootView([rootTag intValue]);
         if (_rootNode) {
             _rootNode->ReleaseResources();
@@ -1115,7 +1116,6 @@ - (void)invalidate {
     id jsExecutor = _javaScriptExecutor;
     id moduleSetup = _moduleSetup;
     _displayLink = nil;
-    _javaScriptExecutor = nil;
     _moduleSetup = nil;
     _startTime = footstone::TimePoint::SystemNow();
     self.moduleSemaphore = nil;