From 70883f8db70f4b4e7c06582fb803d89ad9425dec Mon Sep 17 00:00:00 2001 From: junyi233 Date: Thu, 24 Aug 2023 04:25:30 +0000 Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: junyi233 --- frameworks/bundle_lite/src/ability_info_utils.cpp | 2 +- services/bundlemgr_lite/src/gt_bundle_manager_service.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frameworks/bundle_lite/src/ability_info_utils.cpp b/frameworks/bundle_lite/src/ability_info_utils.cpp index 1954af6..1edb109 100644 --- a/frameworks/bundle_lite/src/ability_info_utils.cpp +++ b/frameworks/bundle_lite/src/ability_info_utils.cpp @@ -207,7 +207,7 @@ bool AbilityInfoUtils::SetAbilityInfoSkill(AbilityInfo *abilityInfo, Skill * con if (skills[i] == nullptr) { return false; } - abilityInfo->skills[i] = (Skill *)AdapterMalloc(sizeof(Skill)); + abilityInfo->skills[i] = static_cast(AdapterMalloc(sizeof(Skill))); CopyStringArray(abilityInfo->skills[i]->entities, skills[i]->entities, MAX_SKILL_ITEM); CopyStringArray(abilityInfo->skills[i]->actions, skills[i]->actions, MAX_SKILL_ITEM); } diff --git a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp index 496ed05..01aa544 100644 --- a/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/gt_bundle_manager_service.cpp @@ -350,8 +350,8 @@ bool GtManagerService::MatchSkills(const Want *want, Skill *const skills[]) } bool GtManagerService::isMatchActions(const char *actions, char *const skillActions[]) { - if (actions == nullptr && skillActions == nullptr) { - return true; + if (actions == nullptr || skillActions == nullptr) { + return false; } for (int32_t i = 0; i < MAX_SKILL_ITEM; i++) { if (skillActions[i] == nullptr) { @@ -953,6 +953,9 @@ void GtManagerService::TransformJsToBcWhenRestart(const char *codePath, const ch } cJSON *oldJsEngineVerObj = cJSON_GetObjectItem(installRecordJson, JSON_SUB_KEY_JSENGINE_VERSION); + if (oldJsEngineVerObj == nullptr) { + return; + } if (cJSON_IsString(oldJsEngineVerObj) && strcmp(oldJsEngineVerObj->valuestring, jsEngineVer_) == 0) { cJSON_Delete(jsEngineVerObj); cJSON *transformResultObj = cJSON_GetObjectItem(installRecordJson, JSON_SUB_KEY_TRANSFORM_RESULT); -- Gitee