From 5e7fe7bbf4c27630dc2c135cfc41ab419835b01e Mon Sep 17 00:00:00 2001 From: "zhangyafei.echo" Date: Fri, 7 Jun 2024 10:40:07 +0800 Subject: [PATCH] use shared_ptr instead of unique_ptr, avoid crash of jsextensioncommon. Sig:SIG_ApplicationFramework Feature or BugFix: Feature Binary Source: No Signed-off-by: zhangyafei.echo Change-Id: Iba6d87ba7ccff91cc07a9f0175b1ab908f8347c3 --- .../ability/native/ui_extension_ability/js_ui_extension.cpp | 3 +-- .../ability/native/ui_extension_ability/js_ui_extension.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frameworks/native/ability/native/ui_extension_ability/js_ui_extension.cpp b/frameworks/native/ability/native/ui_extension_ability/js_ui_extension.cpp index 188ee34a2b..a4946e933c 100755 --- a/frameworks/native/ability/native/ui_extension_ability/js_ui_extension.cpp +++ b/frameworks/native/ability/native/ui_extension_ability/js_ui_extension.cpp @@ -334,8 +334,7 @@ void JsUIExtension::OnStopCallBack() auto applicationContext = Context::GetApplicationContext(); if (applicationContext != nullptr) { - std::shared_ptr sharedJsObj = std::move(jsObj_); - applicationContext->DispatchOnAbilityDestroy(sharedJsObj); + applicationContext->DispatchOnAbilityDestroy(jsObj_); } } diff --git a/interfaces/kits/native/ability/native/ui_extension_ability/js_ui_extension.h b/interfaces/kits/native/ability/native/ui_extension_ability/js_ui_extension.h index 21b3997029..e21d8ac2ac 100755 --- a/interfaces/kits/native/ability/native/ui_extension_ability/js_ui_extension.h +++ b/interfaces/kits/native/ability/native/ui_extension_ability/js_ui_extension.h @@ -197,7 +197,7 @@ private: const sptr &sessionInfo); JsRuntime& jsRuntime_; - std::unique_ptr jsObj_; + std::shared_ptr jsObj_ = nullptr; std::shared_ptr shellContextRef_ = nullptr; std::mutex uiWindowMutex_; std::map> uiWindowMap_;