1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/module/GlobalModuleContext.cpp b/src/core/module/GlobalModuleContext.cpp
index cb459f65..4195d719 100644
--- a/src/core/module/GlobalModuleContext.cpp
+++ b/src/core/module/GlobalModuleContext.cpp
@@ -119,7 +119,8 @@ class GlobalModuleContext::Impl {
     ModuleRegisterInfo register_info;
     register_info.module = module;
     register_info.channel = acquire_new_unique_channel();
-    register_info.task_runner = std::make_shared<Thread::TaskRunner>();
+    register_info.task_runner =
+        GpgFrontend::SecureCreateSharedObject<Thread::TaskRunner>();
     register_info.task_runner->Start();
 
     // move module to its task runner' thread
@@ -128,7 +129,8 @@ class GlobalModuleContext::Impl {
 
     // Register the module with its identifier.
     module_register_table_[module->GetModuleIdentifier()] =
-        std::make_shared<ModuleRegisterInfo>(std::move(register_info));
+        GpgFrontend::SecureCreateSharedObject<ModuleRegisterInfo>(
+            std::move(register_info));
 
     SPDLOG_DEBUG("successfully registered module: {}",
                  module->GetModuleIdentifier());