From dd58ca3600ffa8a50dd4b6ca38e0485bb76df86f Mon Sep 17 00:00:00 2001
From: zhangzezhong <zhangzezhong8@huawei-partners.com>
Date: Mon, 11 Aug 2025 19:35:27 +0800
Subject: [PATCH] code check

Signed-off-by: zhangzezhong <zhangzezhong8@huawei-partners.com>
---
 .../ets/ani/ability_manager/src/ets_ability_manager.cpp       | 4 ++--
 .../include/ets_ability_first_frame_state_observer.h          | 4 ++--
 frameworks/ets/ani/app_manager/src/ets_app_manager.cpp        | 4 ++--
 .../ets/ani/form_extension_ability/src/ets_form_extension.cpp | 3 +--
 frameworks/ets/ani/wantagent/src/ani_want_agent.cpp           | 4 ++++
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp b/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp
index 6fc47591411..4cb274239e2 100644
--- a/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp
+++ b/frameworks/ets/ani/ability_manager/src/ets_ability_manager.cpp
@@ -183,7 +183,7 @@ void EtsAbilityManager::IsEmbeddedOpenAllowed(ani_env *env, ani_object contextOb
 
 void EtsAbilityManager::NativeOn(ani_env *env, ani_string aniType, ani_object aniObserver)
 {
-    TAG_LOGD(AAFwkTag::ABILITYMGR, "nativeOn called %{public}p", aniObserver);
+    TAG_LOGD(AAFwkTag::ABILITYMGR, "nativeOn called");
     if (env == nullptr) {
         TAG_LOGE(AAFwkTag::ABILITYMGR, "env null ptr");
         return;
@@ -229,7 +229,7 @@ void EtsAbilityManager::NativeOn(ani_env *env, ani_string aniType, ani_object an
 
 void EtsAbilityManager::NativeOff(ani_env *env, ani_string aniType, ani_object aniObserver)
 {
-    TAG_LOGD(AAFwkTag::ABILITYMGR, "nativeOff called %{public}p", aniObserver);
+    TAG_LOGD(AAFwkTag::ABILITYMGR, "nativeOff called");
     if (env == nullptr) {
         TAG_LOGE(AAFwkTag::ABILITYMGR, "env null ptr");
         return;
diff --git a/frameworks/ets/ani/app_manager/include/ets_ability_first_frame_state_observer.h b/frameworks/ets/ani/app_manager/include/ets_ability_first_frame_state_observer.h
index 65f37ca5945..b250a0d0688 100644
--- a/frameworks/ets/ani/app_manager/include/ets_ability_first_frame_state_observer.h
+++ b/frameworks/ets/ani/app_manager/include/ets_ability_first_frame_state_observer.h
@@ -46,8 +46,8 @@ public:
     ani_ref GetAniObserver() { return etsObserverObject_; }
 private:
     ani_status AniSendEvent(const std::function<void()> task);
-    ani_vm *etsVm_;
-    ani_ref etsObserverObject_;
+    ani_vm *etsVm_ = nullptr;
+    ani_ref etsObserverObject_ = nullptr;
     std::shared_ptr<AppExecFwk::EventHandler> mainHandler_ = nullptr;
 };
 
diff --git a/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp b/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp
index e094ed923b2..7a4779205e5 100644
--- a/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp
+++ b/frameworks/ets/ani/app_manager/src/ets_app_manager.cpp
@@ -1115,7 +1115,7 @@ void EtsAppManager::OnOnAbilityFirstFrameState(
     ani_env *env, ani_string type, ani_object aniObserver, ani_object aniBundleName)
 {
 #ifdef SUPPORT_SCREEN
-    TAG_LOGD(AAFwkTag::APPMGR, "OnOnAbilityFirstFrameState called %{public}p", aniObserver);
+    TAG_LOGD(AAFwkTag::APPMGR, "OnOnAbilityFirstFrameState called");
     if (env == nullptr) {
         TAG_LOGE(AAFwkTag::APPMGR, "env null ptr");
         return;
@@ -1203,7 +1203,7 @@ void EtsAppManager::OnOnAppForegroundState(ani_env *env, ani_string type, ani_ob
 void EtsAppManager::OnOffAbilityFirstFrameState(ani_env *env, ani_string type, ani_object aniObserver)
 {
 #ifdef SUPPORT_SCREEN
-    TAG_LOGD(AAFwkTag::APPMGR, "OnOffAbilityFirstFrameState called %{public}p", aniObserver);
+    TAG_LOGD(AAFwkTag::APPMGR, "OnOffAbilityFirstFrameState called");
     if (env == nullptr) {
         TAG_LOGE(AAFwkTag::APPMGR, "env null ptr");
         return;
diff --git a/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp
index cd1b713570a..1f89d73b0ee 100644
--- a/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp
+++ b/frameworks/ets/ani/form_extension_ability/src/ets_form_extension.cpp
@@ -717,8 +717,7 @@ FormState ETSFormExtension::OnAcquireFormState(const Want &want)
     ani_status status = env->Object_GetFieldByName_Ref(
         static_cast<ani_object>(etsAbilityObj_->aniRef), "onAcquireFormState", &nameRef);
     if (status != ANI_OK) {
-        TAG_LOGE(AAFwkTag::FORM_EXT, "Object_GetFieldByName status: %{public}d, %{public}p, %{public}p",
-            status, etsAbilityObj_->aniRef, etsAbilityObj_->aniObj);
+        TAG_LOGE(AAFwkTag::FORM_EXT, "onAcquireFormState GetField status: %{public}d", status);
         return AppExecFwk::FormState::DEFAULT;
     }
     ani_ref argv[] = { wantRef };
diff --git a/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp b/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp
index 88d10cf7104..2ed838eb733 100644
--- a/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp
+++ b/frameworks/ets/ani/wantagent/src/ani_want_agent.cpp
@@ -120,6 +120,10 @@ void TriggerCompleteCallBack::OnSendFinished(
         dataWorker->wantAgent = new (std::nothrow) WantAgent(triggerCompleteInfo_.wantAgent->GetPendingWant());
     }
     OnSendFinishedCallback(dataWorker);
+    if (dataWorker->wantAgent != nullptr) {
+        delete dataWorker->wantAgent;
+        dataWorker->wantAgent = nullptr;
+    }
     if (dataWorker != nullptr) {
         delete dataWorker;
         dataWorker = nullptr;
-- 
Gitee