fix(core): fix mutex crash

(cherry picked from commit 62fc9cf)
Tencent · May 16, 2022 · de3dad1 · de3dad1
1 parent 486246b
commit de3dad1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/core/include/core/engine.h b/core/include/core/engine.h
@@ -55,6 +55,7 @@ class Engine {
 
   void TerminateRunner();
   inline std::shared_ptr<JavaScriptTaskRunner> GetJSRunner() {
+    std::lock_guard<std::mutex> lock(js_runner_mutex_);
     return js_runner_;
   }
   inline std::shared_ptr<WorkerTaskRunner> GetWorkerTaskRunner() {
@@ -73,6 +74,6 @@ class Engine {
   std::shared_ptr<VM> vm_;
   std::unique_ptr<RegisterMap> map_;
   std::mutex cnt_mutex_;
-  std::mutex runner_mutex_;
+  std::mutex js_runner_mutex_;
   uint32_t scope_cnt_;
 };
diff --git a/core/src/engine.cc b/core/src/engine.cc
@@ -44,11 +44,14 @@ Engine::~Engine() {
 
 void Engine::TerminateRunner() {
   TDF_BASE_DLOG(INFO) << "~TerminateRunner";
-  std::lock_guard<std::mutex> lock(runner_mutex_);
-  if (js_runner_) {
-    js_runner_->Terminate();
-    js_runner_ = nullptr;
+  {
+    std::lock_guard<std::mutex> lock(js_runner_mutex_);
+    if (js_runner_) {
+      js_runner_->Terminate();
+      js_runner_ = nullptr;
+    }
   }
+
   if (worker_task_runner_) {
     worker_task_runner_->Terminate();
     worker_task_runner_ = nullptr;

diff --git a/core/src/modules/contextify_module.cc b/core/src/modules/contextify_module.cc
@@ -196,7 +196,10 @@ void ContextifyModule::LoadUntrustedContent(const CallbackInfo& info) {
         RemoveCBFunc(uri);
       }
     };
-    scope->GetTaskRunner()->PostTask(js_task);
+    auto runner = scope->GetTaskRunner();
+    if (runner) {
+      runner->PostTask(js_task);
+    }
   };
   loader->RequestUntrustedContent(uri, cb);
   info.GetReturnValue()->SetUndefined();