diff --git a/frameworks/bundle_lite/src/ability_info_utils.cpp b/frameworks/bundle_lite/src/ability_info_utils.cpp index 1954af6b66fccf2be81024efd7e7f0aa5ec41123..1edb1099114621659725b2d4419293a895e122c5 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 496ed055b06c6fe77581e07f67eaa40a028b12b7..01aa5446b865e7b677f091dd2de07719d7625b2d 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);