From 7ffb134d79840e11416cfeb2e0e465e9e401d64a Mon Sep 17 00:00:00 2001
From: RuiChen_01 <chenrui193@huawei.com>
Date: Wed, 31 Dec 2025 19:40:49 +0800
Subject: [PATCH] fix_memory2

Signed-off-by: RuiChen_01 <chenrui193@huawei.com>
---
 .../js/napi/ability_manager/js_ability_manager.cpp   |  3 +++
 .../ability_manager/js_ability_manager_utils.cpp     | 12 ++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frameworks/js/napi/ability_manager/js_ability_manager.cpp b/frameworks/js/napi/ability_manager/js_ability_manager.cpp
index 8a20ec64ad..0300fbc665 100644
--- a/frameworks/js/napi/ability_manager/js_ability_manager.cpp
+++ b/frameworks/js/napi/ability_manager/js_ability_manager.cpp
@@ -368,6 +368,7 @@ private:
         TAG_LOGD(AAFwkTag::ABILITYMGR, "called");
         NapiAsyncTask::CompleteCallback complete =
             [](napi_env env, NapiAsyncTask &task, int32_t status) {
+                HandleScope handleScope(env);
                 std::vector<AAFwk::AbilityRunningInfo> infos;
                 auto errcode = AbilityManagerClient::GetInstance()->GetAbilityRunningInfos(infos);
                 if (errcode == 0) {
@@ -410,6 +411,7 @@ private:
 
         NapiAsyncTask::CompleteCallback complete =
             [upperLimit](napi_env env, NapiAsyncTask &task, int32_t status) {
+                HandleScope handleScope(env);
                 std::vector<AAFwk::ExtensionRunningInfo> infos;
                 auto errcode = AbilityManagerClient::GetInstance()->GetExtensionRunningInfos(upperLimit, infos);
                 if (errcode == 0) {
@@ -500,6 +502,7 @@ private:
 #endif
         NapiAsyncTask::CompleteCallback complete =
             [](napi_env env, NapiAsyncTask &task, int32_t status) {
+                HandleScope handleScope(env);
                 AppExecFwk::ElementName elementName = AbilityManagerClient::GetInstance()->GetTopAbility();
 #ifdef ENABLE_ERRCOE
                 task.ResolveWithNoError(env, CreateJsElementName(env, elementName));
diff --git a/frameworks/js/napi/ability_manager/js_ability_manager_utils.cpp b/frameworks/js/napi/ability_manager/js_ability_manager_utils.cpp
index df047c71a8..d2d1b8e84e 100644
--- a/frameworks/js/napi/ability_manager/js_ability_manager_utils.cpp
+++ b/frameworks/js/napi/ability_manager/js_ability_manager_utils.cpp
@@ -49,6 +49,7 @@ napi_value CreateJSToken(napi_env env, const sptr<IRemoteObject> target)
 
 napi_value CreateJsAbilityRunningInfoArray(napi_env env, const std::vector<AAFwk::AbilityRunningInfo> &infos)
 {
+    HandleEscape handleEscape(env);
     napi_value arrayValue = nullptr;
     napi_status createStatus = napi_create_array_with_length(env, infos.size(), &arrayValue);
     if (createStatus != napi_ok || arrayValue == nullptr) {
@@ -59,7 +60,7 @@ napi_value CreateJsAbilityRunningInfoArray(napi_env env, const std::vector<AAFwk
     for (const auto &runningInfo : infos) {
         napi_set_element(env, arrayValue, index++, CreateJsAbilityRunningInfo(env, runningInfo));
     }
-    return arrayValue;
+    return handleEscape.Escape(arrayValue);
 }
 
 napi_value CreateJsElementName(napi_env env, const AppExecFwk::ElementName &elementName)
@@ -69,6 +70,7 @@ napi_value CreateJsElementName(napi_env env, const AppExecFwk::ElementName &elem
 
 napi_value CreateJsExtensionRunningInfoArray(napi_env env, const std::vector<AAFwk::ExtensionRunningInfo> &infos)
 {
+    HandleEscape handleEscape(env);
     napi_value arrayValue = nullptr;
     napi_status createStatus = napi_create_array_with_length(env, infos.size(), &arrayValue);
     if (createStatus != napi_ok || arrayValue == nullptr) {
@@ -79,11 +81,12 @@ napi_value CreateJsExtensionRunningInfoArray(napi_env env, const std::vector<AAF
     for (const auto &runningInfo : infos) {
         napi_set_element(env, arrayValue, index++, CreateJsExtensionRunningInfo(env, runningInfo));
     }
-    return arrayValue;
+    return handleEscape.Escape(arrayValue);
 }
 
 napi_value CreateJsAbilityRunningInfo(napi_env env, const AAFwk::AbilityRunningInfo &info)
 {
+    HandleEscape handleEscape(env);
     napi_value objValue = nullptr;
     napi_status createStatus = napi_create_object(env, &objValue);
     if (createStatus != napi_ok || objValue == nullptr) {
@@ -98,11 +101,12 @@ napi_value CreateJsAbilityRunningInfo(napi_env env, const AAFwk::AbilityRunningI
     napi_set_named_property(env, objValue, "processName", CreateJsValue(env, info.processName));
     napi_set_named_property(env, objValue, "startTime", CreateJsValue(env, info.startTime));
     napi_set_named_property(env, objValue, "abilityState", CreateJsValue(env, info.abilityState));
-    return objValue;
+    return handleEscape.Escape(objValue);
 }
 
 napi_value CreateJsExtensionRunningInfo(napi_env env, const AAFwk::ExtensionRunningInfo &info)
 {
+    HandleEscape handleEscape(env);
     napi_value objValue = nullptr;
     napi_status createStatus = napi_create_object(env, &objValue);
     if (createStatus != napi_ok || objValue == nullptr) {
@@ -118,7 +122,7 @@ napi_value CreateJsExtensionRunningInfo(napi_env env, const AAFwk::ExtensionRunn
     napi_set_named_property(env, objValue, "processName", CreateJsValue(env, info.processName));
     napi_set_named_property(env, objValue, "startTime", CreateJsValue(env, info.startTime));
     napi_set_named_property(env, objValue, "clientPackage", CreateNativeArray(env, info.clientPackage));
-    return objValue;
+    return handleEscape.Escape(objValue);
 }
 
 napi_value AbilityStateInit(napi_env env)