From 656137ea678a855f838021c45701a46f53078cc7 Mon Sep 17 00:00:00 2001 From: wangdengjia Date: Sat, 8 Jul 2023 15:28:48 +0800 Subject: [PATCH 1/3] =?UTF-8?q?IssueNo:#I79K2H:=E8=BD=BB=E9=B8=BF=E8=92=99?= =?UTF-8?q?=E7=89=B9=E6=80=A7=E5=9B=9E=E5=90=88=E8=93=9D=E5=8C=BA=20Descri?= =?UTF-8?q?ption:=20L0=20bms=20add=20metadata=20Sig:appexecfwk=20Feature?= =?UTF-8?q?=20or=20Bugfix:Feature=20Binary=20Source:No?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangdengjia wangdengjia@huawei.com Change-Id: Ic865914ab3cde4d8de121eb580d10cc6b60726be Signed-off-by: wangdengjia --- frameworks/want_lite/src/want.cpp | 2 ++ interfaces/kits/want_lite/want.h | 2 ++ services/abilitymgr_lite/src/slite/bms_helper.cpp | 1 + 3 files changed, 5 insertions(+) diff --git a/frameworks/want_lite/src/want.cpp b/frameworks/want_lite/src/want.cpp index a42a406..e55af67 100644 --- a/frameworks/want_lite/src/want.cpp +++ b/frameworks/want_lite/src/want.cpp @@ -71,6 +71,8 @@ void ClearWant(Want *want) #endif AdapterFree(want->appPath); AdapterFree(want->data); + AdapterFree(want->actions); + AdapterFree(want->entities); } bool SetWantElement(Want *want, ElementName element) diff --git a/interfaces/kits/want_lite/want.h b/interfaces/kits/want_lite/want.h index aba1ba5..f7d41a6 100644 --- a/interfaces/kits/want_lite/want.h +++ b/interfaces/kits/want_lite/want.h @@ -79,6 +79,8 @@ typedef struct { const char *appPath; uint32_t mission; + char *actions; + char *entities; } Want; #ifdef __cplusplus diff --git a/services/abilitymgr_lite/src/slite/bms_helper.cpp b/services/abilitymgr_lite/src/slite/bms_helper.cpp index 71b8b82..47dd9c5 100644 --- a/services/abilitymgr_lite/src/slite/bms_helper.cpp +++ b/services/abilitymgr_lite/src/slite/bms_helper.cpp @@ -136,6 +136,7 @@ uint8_t BMSHelper::QueryAbilitySvcInfo(const Want *want, AbilitySvcInfo *svcInfo } AbilityInfo abilityInfo = { nullptr, nullptr }; + memset_s(&abilityInfo, sizeof(AbilityInfo), 0, sizeof(AbilityInfo)); QueryAbilityInfo(want, &abilityInfo); if (!IsValidAbility(&abilityInfo)) { APP_ERRCODE_EXTRA(EXCE_ACE_APP_START, EXCE_ACE_APP_START_UNKNOWN_BUNDLE_INFO); -- Gitee From c057336881efa0269f5ad139c292a0b111cbfb10 Mon Sep 17 00:00:00 2001 From: wangdengjia Date: Tue, 1 Aug 2023 07:31:47 +0000 Subject: [PATCH 2/3] update frameworks/want_lite/src/want.cpp. Signed-off-by: wangdengjia --- frameworks/want_lite/src/want.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frameworks/want_lite/src/want.cpp b/frameworks/want_lite/src/want.cpp index e55af67..09c9c6d 100644 --- a/frameworks/want_lite/src/want.cpp +++ b/frameworks/want_lite/src/want.cpp @@ -71,8 +71,10 @@ void ClearWant(Want *want) #endif AdapterFree(want->appPath); AdapterFree(want->data); +#ifndef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER AdapterFree(want->actions); AdapterFree(want->entities); +#endif } bool SetWantElement(Want *want, ElementName element) -- Gitee From 9bcdf4ff83674119a4b583b3c4d9ee12690c3f83 Mon Sep 17 00:00:00 2001 From: wangdengjia Date: Tue, 1 Aug 2023 07:33:06 +0000 Subject: [PATCH 3/3] update interfaces/kits/want_lite/want.h. Signed-off-by: wangdengjia --- interfaces/kits/want_lite/want.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/interfaces/kits/want_lite/want.h b/interfaces/kits/want_lite/want.h index f7d41a6..719c1cf 100644 --- a/interfaces/kits/want_lite/want.h +++ b/interfaces/kits/want_lite/want.h @@ -79,8 +79,10 @@ typedef struct { const char *appPath; uint32_t mission; +#ifndef OHOS_APPEXECFWK_BMS_BUNDLEMANAGER char *actions; char *entities; +#endif } Want; #ifdef __cplusplus -- Gitee