fix(ios): add nullptr exception protection in rare scenarios (#4055)

Tencent · Oct 11, 2024 · cb8c334 · cb8c334
1 parent 0336c26
commit cb8c334
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/framework/ios/base/executors/HippyJSExecutor.mm b/framework/ios/base/executors/HippyJSExecutor.mm
@@ -661,7 +661,7 @@ - (void)executeBlockOnJavaScriptQueue:(dispatch_block_t)block {
             return;
         }
     }
-    std::shared_ptr<EngineResource> engineRsc = [[HippyJSEnginesMapper defaultInstance] JSEngineResourceForKey:self.enginekey];
+    auto engineRsc = [[HippyJSEnginesMapper defaultInstance] JSEngineResourceForKey:self.enginekey];
     if (!engineRsc) {
         return;
     }
@@ -670,8 +670,8 @@ - (void)executeBlockOnJavaScriptQueue:(dispatch_block_t)block {
         auto runner = engine->GetJsTaskRunner();
         if (footstone::Worker::IsTaskRunning() && runner == footstone::runner::TaskRunner::GetCurrentTaskRunner()) {
             block();
-        } else {
-            engine->GetJsTaskRunner()->PostTask(block);
+        } else if (runner) {
+            runner->PostTask(block);
         }
     }
 }
@@ -683,13 +683,16 @@ - (void)executeAsyncBlockOnJavaScriptQueue:(dispatch_block_t)block {
             return;
         }
     }
-    std::shared_ptr<EngineResource> engineRsc = [[HippyJSEnginesMapper defaultInstance] JSEngineResourceForKey:self.enginekey];
+    auto engineRsc = [[HippyJSEnginesMapper defaultInstance] JSEngineResourceForKey:self.enginekey];
     if (!engineRsc) {
         return;
     }
     auto engine = engineRsc->GetEngine();
     if (engine) {
-        engine->GetJsTaskRunner()->PostTask(block);
+        auto runner = engine->GetJsTaskRunner();
+        if (runner) {
+            runner->PostTask(block);
+        }
     }
 }
 

diff --git a/renderer/native/ios/renderer/HippyUIManager.mm b/renderer/native/ios/renderer/HippyUIManager.mm
@@ -1173,7 +1173,7 @@ - (void)addEventName:(const std::string &)name
                     if (!bridge) {
                         return;
                     }
-                    [bridge.javaScriptExecutor executeBlockOnJavaScriptQueue:^{
+                    [bridge.javaScriptExecutor executeAsyncBlockOnJavaScriptQueue:^{
                         auto strongNode = weakNode.lock();
                         if (strongNode) {
                             strongNode->HandleEvent(event);