From 27bddbae0af9d85ef8c1b3a80bef4a6c5dc6d46a Mon Sep 17 00:00:00 2001 From: chennian Date: Tue, 12 Aug 2025 08:58:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=89=E5=85=A8=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=8E=92=E6=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chennian Change-Id: Ia7ee9c4d8fcf87ed1e45d7c41b46252f27f9e286 --- .../src/ani_ability_access_ctrl.cpp | 16 ++-- .../napi/accesstoken/src/napi_atmanager.cpp | 87 +++++++++++-------- .../napi_request_global_switch_on_setting.cpp | 5 +- .../src/napi_request_permission.cpp | 10 +-- .../napi_request_permission_on_setting.cpp | 2 +- .../napi/privacy/src/napi_context_common.cpp | 3 + .../js/napi/privacy/src/native_module.cpp | 2 +- .../src/permission_record_manager_napi.cpp | 28 +++--- .../include/ability_access_control.h | 2 +- .../src/ability_access_control.cpp | 2 +- .../src/permission/permission_data_brief.cpp | 2 +- .../cpp/src/permission/permission_manager.cpp | 4 +- .../service/accesstoken_manager_service.cpp | 2 +- .../cpp/src/token/accesstoken_id_manager.cpp | 12 +-- .../audio_manager/audio_manager_adapter.cpp | 2 +- .../camera_manager/camera_manager_adapter.cpp | 2 +- .../src/command/base_remote_command.cpp | 31 +++++-- .../command/sync_remote_hap_token_command.cpp | 2 +- .../update_remote_hap_token_command.cpp | 2 +- .../src/remote/soft_bus_channel.cpp | 26 +++--- .../src/remote/soft_bus_socket_listener.cpp | 8 +- .../src/service/token_sync_manager_stub.cpp | 2 +- .../test/unittest/token_sync_service_test.cpp | 5 ++ 23 files changed, 147 insertions(+), 110 deletions(-) diff --git a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp index 870f6c7e0..bcd54ed65 100644 --- a/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp +++ b/frameworks/ets/ani/accesstoken/src/ani_ability_access_ctrl.cpp @@ -292,7 +292,7 @@ static ani_int CheckAccessTokenExecute([[maybe_unused]] ani_env* env, [[maybe_un return static_cast(asyncContext->grantStatus); } -static void GrantUserGrantedPermissionExecute([[maybe_unused]] ani_env *env, [[maybe_unused]] ani_object object, +static void GrantUserGrantedPermissionExecute([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object object, ani_int aniTokenID, ani_string aniPermission, ani_int aniFlags) { if (env == nullptr) { @@ -810,7 +810,7 @@ static void UnregisterPermStateChangeCallback([[maybe_unused]] ani_env* env, [[m return; } -void InitAbilityCtrlFunction(ani_env *env) +void InitAbilityCtrlFunction(ani_env* env) { if (env == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "Env is null."); @@ -851,13 +851,13 @@ void InitAbilityCtrlFunction(ani_env *env) ani_native_function { "getPermissionsStatusExecute", nullptr, reinterpret_cast(GetPermissionsStatusExecute) }, ani_native_function{ "getPermissionFlagsExecute", - nullptr, reinterpret_cast(GetPermissionFlagsExecute) }, + nullptr, reinterpret_cast(GetPermissionFlagsExecute) }, ani_native_function{ "setPermissionRequestToggleStatusExecute", - nullptr, reinterpret_cast(SetPermissionRequestToggleStatusExecute) }, + nullptr, reinterpret_cast(SetPermissionRequestToggleStatusExecute) }, ani_native_function{ "getPermissionRequestToggleStatusExecute", - nullptr, reinterpret_cast(GetPermissionRequestToggleStatusExecute) }, + nullptr, reinterpret_cast(GetPermissionRequestToggleStatusExecute) }, ani_native_function{ "requestAppPermOnSettingExecute", - nullptr, reinterpret_cast(RequestAppPermOnSettingExecute) }, + nullptr, reinterpret_cast(RequestAppPermOnSettingExecute) }, ani_native_function { "onExcute", nullptr, reinterpret_cast(RegisterPermStateChangeCallback) }, ani_native_function { "offExcute", nullptr, reinterpret_cast(UnregisterPermStateChangeCallback) }, }; @@ -869,8 +869,8 @@ void InitAbilityCtrlFunction(ani_env *env) extern "C" { ANI_EXPORT ani_status ANI_Constructor(ani_vm* vm, uint32_t* result) { - if (vm == nullptr) { - LOGE(ATM_DOMAIN, ATM_TAG, "Vm is null."); + if (vm == nullptr || result == nullptr) { + LOGE(ATM_DOMAIN, ATM_TAG, "Vm of result is null."); return ANI_INVALID_ARGS; } ani_env* env; diff --git a/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp b/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp index d0279afb6..7d06125bd 100644 --- a/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_atmanager.cpp @@ -93,6 +93,9 @@ static bool ConvertPermStateChangeInfo(napi_env env, napi_value value, const Per static void NotifyPermStateChanged(RegisterPermStateChangeWorker* registerPermStateChangeData) { + if (registerPermStateChangeData == nullptr) { + return; + } napi_value result = {nullptr}; NAPI_CALL_RETURN_VOID(registerPermStateChangeData->env, napi_create_object(registerPermStateChangeData->env, &result)); @@ -208,8 +211,12 @@ void RegisterPermStateChangeScopePtr::DeleteNapiRef() } } -void NapiAtManager::SetNamedProperty(napi_env env, napi_value dstObj, const int32_t objValue, const char *propName) +void NapiAtManager::SetNamedProperty(napi_env env, napi_value dstObj, const int32_t objValue, const char* propName) { + if (propName == nullptr) { + return; + } + napi_value prop = nullptr; napi_create_int32(env, objValue, &prop); napi_set_named_property(env, dstObj, propName, prop); @@ -332,7 +339,7 @@ bool NapiAtManager::ParseInputVerifyPermissionOrGetFlag(const napi_env env, cons napi_value argv[NapiContextCommon::MAX_PARAMS_TWO] = { nullptr }; napi_value thisVar = nullptr; std::string errMsg; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data), false); if (argc < NapiContextCommon::MAX_PARAMS_TWO) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, @@ -369,7 +376,7 @@ bool NapiAtManager::ParseInputVerifyPermissionSync(const napi_env env, const nap napi_value argv[NapiContextCommon::MAX_PARAMS_TWO] = { nullptr }; napi_value thisVar = nullptr; std::string errMsg; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data), false); if (argc < NapiContextCommon::MAX_PARAMS_TWO) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, @@ -398,9 +405,9 @@ bool NapiAtManager::ParseInputVerifyPermissionSync(const napi_env env, const nap return true; } -void NapiAtManager::VerifyAccessTokenExecute(napi_env env, void *data) +void NapiAtManager::VerifyAccessTokenExecute(napi_env env, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { return; } @@ -417,9 +424,9 @@ void NapiAtManager::VerifyAccessTokenExecute(napi_env env, void *data) asyncContext->result = AccessTokenKit::VerifyAccessToken(asyncContext->tokenId, asyncContext->permissionName); } -void NapiAtManager::VerifyAccessTokenComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::VerifyAccessTokenComplete(napi_env env, napi_status status, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "AsyncContext is null."); return; @@ -466,12 +473,12 @@ napi_value NapiAtManager::VerifyAccessToken(napi_env env, napi_callback_info inf return result; } -void NapiAtManager::CheckAccessTokenExecute(napi_env env, void *data) +void NapiAtManager::CheckAccessTokenExecute(napi_env env, void* data) { if (data == nullptr) { return; } - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { return; } @@ -501,10 +508,10 @@ void NapiAtManager::CheckAccessTokenExecute(napi_env env, void *data) asyncContext->permissionName); } -void NapiAtManager::CheckAccessTokenComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::CheckAccessTokenComplete(napi_env env, napi_status status, void* data) __attribute__((no_sanitize("cfi"))) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "AsyncContext is null."); return; @@ -656,7 +663,7 @@ bool NapiAtManager::ParseInputGrantOrRevokePermission(const napi_env env, const napi_value argv[NapiContextCommon::MAX_PARAMS_FOUR] = {nullptr}; napi_value thatVar = nullptr; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thatVar, &data), false); // 1: grant and revoke required minnum argc if (argc < NapiContextCommon::MAX_PARAMS_FOUR - 1) { @@ -704,9 +711,9 @@ bool NapiAtManager::ParseInputGrantOrRevokePermission(const napi_env env, const return true; } -void NapiAtManager::GrantUserGrantedPermissionExecute(napi_env env, void *data) +void NapiAtManager::GrantUserGrantedPermissionExecute(napi_env env, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { return; } @@ -743,7 +750,7 @@ void NapiAtManager::GrantUserGrantedPermissionExecute(napi_env env, void *data) asyncContext->tokenId, asyncContext->permissionName.c_str(), asyncContext->flag, asyncContext->errorCode); } -void NapiAtManager::GrantUserGrantedPermissionComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::GrantUserGrantedPermissionComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* context = reinterpret_cast(data); if (context == nullptr) { @@ -786,9 +793,9 @@ napi_value NapiAtManager::GetVersion(napi_env env, napi_callback_info info) return result; } -void NapiAtManager::GetVersionExecute(napi_env env, void *data) +void NapiAtManager::GetVersionExecute(napi_env env, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { return; } @@ -802,9 +809,9 @@ void NapiAtManager::GetVersionExecute(napi_env env, void *data) LOGD(ATM_DOMAIN, ATM_TAG, "Version result = %{public}d.", asyncContext->result); } -void NapiAtManager::GetVersionComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::GetVersionComplete(napi_env env, napi_status status, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "AsyncContext is null."); return; @@ -855,9 +862,9 @@ napi_value NapiAtManager::GrantUserGrantedPermission(napi_env env, napi_callback return result; } -void NapiAtManager::RevokeUserGrantedPermissionExecute(napi_env env, void *data) +void NapiAtManager::RevokeUserGrantedPermissionExecute(napi_env env, void* data) { - AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { return; } @@ -894,9 +901,13 @@ void NapiAtManager::RevokeUserGrantedPermissionExecute(napi_env env, void *data) asyncContext->tokenId, asyncContext->permissionName.c_str(), asyncContext->flag, asyncContext->errorCode); } -void NapiAtManager::RevokeUserGrantedPermissionComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::RevokeUserGrantedPermissionComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); + if (asyncContext == nullptr) { + LOGE(ATM_DOMAIN, ATM_TAG, "AsyncContext is null."); + return; + } std::unique_ptr callbackPtr {asyncContext}; napi_value result = GetNapiNull(env); @@ -943,7 +954,7 @@ napi_value NapiAtManager::RevokeUserGrantedPermission(napi_env env, napi_callbac return result; } -void NapiAtManager::GetPermissionFlagsExecute(napi_env env, void *data) +void NapiAtManager::GetPermissionFlagsExecute(napi_env env, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -955,7 +966,7 @@ void NapiAtManager::GetPermissionFlagsExecute(napi_env env, void *data) asyncContext->permissionName, asyncContext->flag); } -void NapiAtManager::GetPermissionFlagsComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::GetPermissionFlagsComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1008,7 +1019,7 @@ bool NapiAtManager::ParseInputSetToggleStatus(const napi_env env, const napi_cal size_t argc = NapiContextCommon::MAX_PARAMS_TWO; napi_value argv[NapiContextCommon::MAX_PARAMS_TWO] = { nullptr }; napi_value thisVar = nullptr; - void *data = nullptr; + void* data = nullptr; std::string errMsg; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data), false); @@ -1045,7 +1056,7 @@ bool NapiAtManager::ParseInputGetToggleStatus(const napi_env env, const napi_cal napi_value argv[NapiContextCommon::MAX_PARAMS_ONE] = { nullptr }; napi_value thisVar = nullptr; std::string errMsg; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data), false); if (argc < NapiContextCommon::MAX_PARAMS_ONE) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, @@ -1064,7 +1075,7 @@ bool NapiAtManager::ParseInputGetToggleStatus(const napi_env env, const napi_cal return true; } -void NapiAtManager::SetPermissionRequestToggleStatusExecute(napi_env env, void *data) +void NapiAtManager::SetPermissionRequestToggleStatusExecute(napi_env env, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1076,7 +1087,7 @@ void NapiAtManager::SetPermissionRequestToggleStatusExecute(napi_env env, void * asyncContext->status, 0); } -void NapiAtManager::SetPermissionRequestToggleStatusComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::SetPermissionRequestToggleStatusComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1091,7 +1102,7 @@ void NapiAtManager::SetPermissionRequestToggleStatusComplete(napi_env env, napi_ ReturnPromiseResult(env, *asyncContext, result); } -void NapiAtManager::GetPermissionRequestToggleStatusExecute(napi_env env, void *data) +void NapiAtManager::GetPermissionRequestToggleStatusExecute(napi_env env, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1103,7 +1114,7 @@ void NapiAtManager::GetPermissionRequestToggleStatusExecute(napi_env env, void * asyncContext->status, 0); } -void NapiAtManager::GetPermissionRequestToggleStatusComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::GetPermissionRequestToggleStatusComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1225,7 +1236,7 @@ bool NapiAtManager::FillPermStateChangeScope(const napi_env env, const napi_valu return true; } -void NapiAtManager::RequestAppPermOnSettingExecute(napi_env env, void *data) +void NapiAtManager::RequestAppPermOnSettingExecute(napi_env env, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1234,7 +1245,7 @@ void NapiAtManager::RequestAppPermOnSettingExecute(napi_env env, void *data) asyncContext->errorCode = AccessTokenKit::RequestAppPermOnSetting(asyncContext->tokenId); } -void NapiAtManager::RequestAppPermOnSettingComplete(napi_env env, napi_status status, void *data) +void NapiAtManager::RequestAppPermOnSettingComplete(napi_env env, napi_status status, void* data) { AtManagerAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -1262,7 +1273,7 @@ napi_value NapiAtManager::RequestAppPermOnSetting(napi_env env, napi_callback_in napi_value argv[NapiContextCommon::MAX_PARAMS_ONE] = {nullptr}; napi_value thatVar = nullptr; - void *data = nullptr; + void* data = nullptr; NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thatVar, &data)); if (argc < NapiContextCommon::MAX_PARAMS_ONE) { NAPI_CALL(env, napi_throw(env, @@ -1302,7 +1313,7 @@ bool NapiAtManager::ParseInputGetPermStatus(const napi_env env, const napi_callb napi_value argv[NapiContextCommon::MAX_PARAMS_ONE] = {nullptr}; napi_value thisVar = nullptr; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, &data), false); if (argc < NapiContextCommon::MAX_PARAMS_ONE) { NAPI_CALL_BASE(env, napi_throw(env, GenerateBusinessError(env, @@ -1402,14 +1413,14 @@ bool NapiAtManager::FillPermStateChangeInfo(const napi_env env, const napi_value registerPermStateChangeInfo.subscriber = std::make_shared(scopeInfo); registerPermStateChangeInfo.subscriber->SetEnv(env); registerPermStateChangeInfo.subscriber->SetCallbackRef(callback); - std::shared_ptr *subscriber = + std::shared_ptr* subscriber = new (std::nothrow) std::shared_ptr( registerPermStateChangeInfo.subscriber); if (subscriber == nullptr) { return false; } napi_status status = napi_wrap(env, thisVar, reinterpret_cast(subscriber), - [](napi_env nev, void *data, void *hint) { + [](napi_env nev, void* data, void* hint) { std::shared_ptr* subscriber = static_cast*>(data); if (subscriber != nullptr && *subscriber != nullptr) { @@ -1614,7 +1625,7 @@ napi_value NapiAtManager::UnregisterPermStateChangeCallback(napi_env env, napi_c } bool NapiAtManager::FindAndGetSubscriberInVector(UnregisterPermStateChangeInfo* unregisterPermStateChangeInfo, - std::vector& batchPermStateChangeRegisters, const napi_env env) + std::vector& batchPermStateChangeRegisters, const napi_env& env) { std::lock_guard lock(g_lockForPermStateChangeRegisters); std::vector targetTokenIDs = unregisterPermStateChangeInfo->scopeInfo.tokenIDs; @@ -1745,7 +1756,7 @@ static napi_module g_module = { .nm_filename = nullptr, .nm_register_func = Init, .nm_modname = "abilityAccessCtrl", - .nm_priv = static_cast(nullptr), + .nm_priv = static_cast(nullptr), .reserved = {nullptr} }; diff --git a/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp b/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp index 329392faf..b2df887ab 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_global_switch_on_setting.cpp @@ -129,6 +129,9 @@ static napi_value GetContext( static void GlobalSwitchResultsCallbackUI(int32_t errorCode, bool switchStatus, std::shared_ptr& data) { + if (data == nullptr) { + return; + } auto* retCB = new (std::nothrow) SwitchOnSettingResultCallback(); if (retCB == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "Insufficient memory for work!"); @@ -514,7 +517,7 @@ napi_value NapiRequestGlobalSwitch::RequestGlobalSwitch(napi_env env, napi_callb NAPI_CALL(env, napi_create_string_utf8(env, "RequestGlobalSwitch", NAPI_AUTO_LENGTH, &resource)); NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, RequestGlobalSwitchExecute, RequestGlobalSwitchComplete, - reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); + reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContextHandle->asyncContextPtr->work, napi_qos_user_initiated)); diff --git a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp index 3412d6280..48ce5bf1d 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_permission.cpp @@ -611,7 +611,7 @@ napi_value NapiRequestPermission::RequestPermissionsFromUser(napi_env env, napi_ NAPI_CALL(env, napi_create_string_utf8(env, "RequestPermissionsFromUser", NAPI_AUTO_LENGTH, &resource)); NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, RequestPermissionsFromUserExecute, RequestPermissionsFromUserComplete, - reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); + reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContextHandle->asyncContextPtr->work, napi_qos_user_initiated)); @@ -792,7 +792,7 @@ napi_value NapiRequestPermission::GetPermissionsStatus(napi_env env, napi_callba napi_create_async_work( env, nullptr, resource, GetPermissionsStatusExecute, GetPermissionsStatusComplete, - reinterpret_cast(asyncContext), &(asyncContext->work)); + reinterpret_cast(asyncContext), &(asyncContext->work)); // add async work handle to the napi queue and wait for result napi_queue_async_work_with_qos(env, asyncContext->work, napi_qos_default); @@ -808,7 +808,7 @@ bool NapiRequestPermission::ParseInputToGetQueryResult(const napi_env& env, cons napi_value argv[NapiContextCommon::MAX_PARAMS_TWO] = {nullptr}; napi_value thatVar = nullptr; - void *data = nullptr; + void* data = nullptr; NAPI_CALL_BASE(env, napi_get_cb_info(env, info, &argc, argv, &thatVar, &data), false); // 1: can request permissions minnum argc if (argc < NapiContextCommon::MAX_PARAMS_TWO - 1) { @@ -839,7 +839,7 @@ bool NapiRequestPermission::ParseInputToGetQueryResult(const napi_env& env, cons return true; } -void NapiRequestPermission::GetPermissionsStatusExecute(napi_env env, void *data) +void NapiRequestPermission::GetPermissionsStatusExecute(napi_env env, void* data) { RequestAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { @@ -865,7 +865,7 @@ void NapiRequestPermission::GetPermissionsStatusExecute(napi_env env, void *data } } -void NapiRequestPermission::GetPermissionsStatusComplete(napi_env env, napi_status status, void *data) +void NapiRequestPermission::GetPermissionsStatusComplete(napi_env env, napi_status status, void* data) { RequestAsyncContext* asyncContext = reinterpret_cast(data); if (asyncContext == nullptr) { diff --git a/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp b/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp index e14d167db..0238091d3 100644 --- a/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp +++ b/frameworks/js/napi/accesstoken/src/napi_request_permission_on_setting.cpp @@ -565,7 +565,7 @@ napi_value NapiRequestPermissionOnSetting::RequestPermissionOnSetting(napi_env e NAPI_CALL(env, napi_create_string_utf8(env, "RequestPermissionOnSetting", NAPI_AUTO_LENGTH, &resource)); NAPI_CALL(env, napi_create_async_work( env, nullptr, resource, RequestPermissionOnSettingExecute, RequestPermissionOnSettingComplete, - reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); + reinterpret_cast(asyncContextHandle.get()), &(asyncContextHandle->asyncContextPtr->work))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContextHandle->asyncContextPtr->work, napi_qos_user_initiated)); diff --git a/frameworks/js/napi/privacy/src/napi_context_common.cpp b/frameworks/js/napi/privacy/src/napi_context_common.cpp index d6984aab8..157456624 100644 --- a/frameworks/js/napi/privacy/src/napi_context_common.cpp +++ b/frameworks/js/napi/privacy/src/napi_context_common.cpp @@ -118,6 +118,9 @@ void PermActiveStatusPtr::ActiveStatusChangeCallback(ActiveChangeResponse& resul void NotifyChangeResponse(const PermActiveStatusWorker* permActiveStatusData) { + if (permActiveStatusData == nullptr) { + return; + } napi_value result = nullptr; NAPI_CALL_RETURN_VOID(permActiveStatusData->env, napi_create_object(permActiveStatusData->env, &result)); diff --git a/frameworks/js/napi/privacy/src/native_module.cpp b/frameworks/js/napi/privacy/src/native_module.cpp index 59b11aafb..b399030d9 100644 --- a/frameworks/js/napi/privacy/src/native_module.cpp +++ b/frameworks/js/napi/privacy/src/native_module.cpp @@ -106,7 +106,7 @@ static napi_module g_module = { .nm_filename = nullptr, .nm_register_func = Init, .nm_modname = "privacyManager", - .nm_priv = ((void *)0), + .nm_priv = ((void*)0), .reserved = {0} }; diff --git a/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp b/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp index d74fff19f..7cae7cf3b 100644 --- a/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp +++ b/frameworks/js/napi/privacy/src/permission_record_manager_napi.cpp @@ -581,7 +581,7 @@ napi_value AddPermissionUsedRecord(napi_env env, napi_callback_info cbinfo) { LOGD(PRI_DOMAIN, PRI_TAG, "AddPermissionUsedRecord begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -607,7 +607,7 @@ napi_value AddPermissionUsedRecord(napi_env env, napi_callback_info cbinfo) resource, AddPermissionUsedRecordExecute, AddPermissionUsedRecordComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); callbackPtr.release(); @@ -646,7 +646,7 @@ napi_value SetPermissionUsedRecordToggleStatus(napi_env env, napi_callback_info { LOGD(PRI_DOMAIN, PRI_TAG, "SetPermissionUsedRecordToggleStatus begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -672,7 +672,7 @@ napi_value SetPermissionUsedRecordToggleStatus(napi_env env, napi_callback_info resource, SetPermissionUsedRecordToggleStatusExecute, SetPermissionUsedRecordToggleStatusComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); @@ -713,7 +713,7 @@ napi_value GetPermissionUsedRecordToggleStatus(napi_env env, napi_callback_info { LOGD(PRI_DOMAIN, PRI_TAG, "GetPermissionUsedRecordToggleStatus begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -736,7 +736,7 @@ napi_value GetPermissionUsedRecordToggleStatus(napi_env env, napi_callback_info resource, GetPermissionUsedRecordToggleStatusExecute, GetPermissionUsedRecordToggleStatusComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); @@ -777,7 +777,7 @@ static void StartUsingPermissionComplete(napi_env env, napi_status status, void* napi_value StartUsingPermission(napi_env env, napi_callback_info cbinfo) { LOGD(PRI_DOMAIN, PRI_TAG, "StartUsingPermission begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -803,7 +803,7 @@ napi_value StartUsingPermission(napi_env env, napi_callback_info cbinfo) resource, StartUsingPermissionExecute, StartUsingPermissionComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); callbackPtr.release(); @@ -844,7 +844,7 @@ napi_value StopUsingPermission(napi_env env, napi_callback_info cbinfo) { LOGD(PRI_DOMAIN, PRI_TAG, "StopUsingPermission begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -870,7 +870,7 @@ napi_value StopUsingPermission(napi_env env, napi_callback_info cbinfo) resource, StopUsingPermissionExecute, StopUsingPermissionComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); callbackPtr.release(); @@ -911,7 +911,7 @@ static void GetPermissionUsedRecordsComplete(napi_env env, napi_status status, v napi_value GetPermissionUsedRecords(napi_env env, napi_callback_info cbinfo) { LOGD(PRI_DOMAIN, PRI_TAG, "GetPermissionUsedRecords begin."); - auto *asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); + auto* asyncContext = new (std::nothrow) RecordManagerAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -937,7 +937,7 @@ napi_value GetPermissionUsedRecords(napi_env env, napi_callback_info cbinfo) resource, GetPermissionUsedRecordsExecute, GetPermissionUsedRecordsComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); callbackPtr.release(); @@ -1297,7 +1297,7 @@ napi_value GetPermissionUsedTypeInfos(napi_env env, napi_callback_info cbinfo) { LOGI(PRI_DOMAIN, PRI_TAG, "GetPermissionUsedTypeInfos begin."); - auto *asyncContext = new (std::nothrow) PermissionUsedTypeAsyncContext(env); + auto* asyncContext = new (std::nothrow) PermissionUsedTypeAsyncContext(env); if (asyncContext == nullptr) { LOGE(PRI_DOMAIN, PRI_TAG, "New struct fail."); return nullptr; @@ -1319,7 +1319,7 @@ napi_value GetPermissionUsedTypeInfos(napi_env env, napi_callback_info cbinfo) resource, GetPermissionUsedTypeInfosExecute, GetPermissionUsedTypeInfosComplete, - reinterpret_cast(asyncContext), + reinterpret_cast(asyncContext), &(asyncContext->asyncWork))); NAPI_CALL(env, napi_queue_async_work_with_qos(env, asyncContext->asyncWork, napi_qos_default)); callbackPtr.release(); diff --git a/interfaces/kits/capi/accesstoken/include/ability_access_control.h b/interfaces/kits/capi/accesstoken/include/ability_access_control.h index 121e5b983..7b5530dff 100644 --- a/interfaces/kits/capi/accesstoken/include/ability_access_control.h +++ b/interfaces/kits/capi/accesstoken/include/ability_access_control.h @@ -51,7 +51,7 @@ extern "C" { * false - The permission has not been granted to this application. * @since 12 */ -bool OH_AT_CheckSelfPermission(const char *permission); +bool OH_AT_CheckSelfPermission(const char* permission); #ifdef __cplusplus } diff --git a/interfaces/kits/capi/accesstoken/src/ability_access_control.cpp b/interfaces/kits/capi/accesstoken/src/ability_access_control.cpp index a477dfed0..cbc72f13b 100644 --- a/interfaces/kits/capi/accesstoken/src/ability_access_control.cpp +++ b/interfaces/kits/capi/accesstoken/src/ability_access_control.cpp @@ -22,7 +22,7 @@ using namespace OHOS::Security::AccessToken; -bool OH_AT_CheckSelfPermission(const char *permission) +bool OH_AT_CheckSelfPermission(const char* permission) { if (permission == nullptr) { return false; diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp index eb326bece..d188f7fb6 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_data_brief.cpp @@ -680,7 +680,7 @@ void PermissionDataBrief::GetPermStatusListByTokenId(AccessTokenID tokenID, } } - AccessTokenIDInner *idInner = reinterpret_cast(&tokenID); + AccessTokenIDInner* idInner = reinterpret_cast(&tokenID); if (static_cast(idInner->type) != TOKEN_HAP) { return; } diff --git a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp index 1e53a5937..74e6cad70 100644 --- a/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/permission/permission_manager.cpp @@ -407,7 +407,7 @@ int32_t PermissionManager::UpdateTokenPermissionState(const std::shared_ptr abilityManagerLoader = GetAbilityManager(); - AbilityManagerAccessLoaderInterface *abilityManager = + AbilityManagerAccessLoaderInterface* abilityManager = abilityManagerLoader->GetObject(); if (abilityManager == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "AbilityManager is nullptr!"); @@ -825,7 +825,7 @@ int32_t PermissionManager::RemovePermStateChangeCallback(const sptr(&tokenID); + AccessTokenIDInner* idInner = reinterpret_cast(&tokenID); ATokenTypeEnum tokenType = (ATokenTypeEnum)(idInner->type); if (tokenType != TOKEN_HAP) { LOGE(ATM_DOMAIN, ATM_TAG, "Invalid token type %{public}d", tokenType); diff --git a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp index 1bd833360..2767cedb0 100644 --- a/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp +++ b/services/accesstokenmanager/main/cpp/src/service/accesstoken_manager_service.cpp @@ -1315,7 +1315,7 @@ int AccessTokenManagerService::Dump(int fd, const std::vector& a if (args.size() < TWO_ARGS) { return ERR_INVALID_VALUE; } - long long tokenID = atoll(static_cast(Str16ToStr8(args.at(1)).c_str())); + long long tokenID = atoll(static_cast(Str16ToStr8(args.at(1)).c_str())); if (tokenID <= 0) { return ERR_INVALID_VALUE; } diff --git a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp index bec5c98d1..558a42cae 100644 --- a/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp +++ b/services/accesstokenmanager/main/cpp/src/token/accesstoken_id_manager.cpp @@ -29,19 +29,19 @@ std::recursive_mutex g_instanceMutex; ATokenTypeEnum AccessTokenIDManager::GetTokenIdTypeEnum(AccessTokenID id) { - AccessTokenIDInner *idInner = reinterpret_cast(&id); + AccessTokenIDInner* idInner = reinterpret_cast(&id); return static_cast(idInner->type); } int AccessTokenIDManager::GetTokenIdDlpFlag(AccessTokenID id) { - AccessTokenIDInner *idInner = reinterpret_cast(&id); + AccessTokenIDInner* idInner = reinterpret_cast(&id); return idInner->dlpFlag; } int AccessTokenIDManager::GetTokenIdCloneFlag(AccessTokenID id) { - AccessTokenIDInner *idInner = reinterpret_cast(&id); + AccessTokenIDInner* idInner = reinterpret_cast(&id); return idInner->cloneFlag; } @@ -58,7 +58,7 @@ ATokenTypeEnum AccessTokenIDManager::GetTokenIdType(AccessTokenID id) int AccessTokenIDManager::RegisterTokenId(AccessTokenID id, ATokenTypeEnum type) { - AccessTokenIDInner *idInner = reinterpret_cast(&id); + AccessTokenIDInner* idInner = reinterpret_cast(&id); if (idInner->version != DEFAULT_TOKEN_VERSION || idInner->type != type) { return ERR_PARAM_INVALID; } @@ -67,7 +67,7 @@ int AccessTokenIDManager::RegisterTokenId(AccessTokenID id, ATokenTypeEnum type) for (std::set::iterator it = tokenIdSet_.begin(); it != tokenIdSet_.end(); ++it) { AccessTokenID tokenId = *it; - AccessTokenIDInner *idInnerExist = reinterpret_cast(&tokenId); + AccessTokenIDInner* idInnerExist = reinterpret_cast(&tokenId); if ((type == idInnerExist->type) && (idInnerExist->tokenUniqueID == idInner->tokenUniqueID)) { return ERR_TOKENID_HAS_EXISTED; } @@ -92,7 +92,7 @@ AccessTokenID AccessTokenIDManager::CreateTokenId(ATokenTypeEnum type, int32_t d innerId.renderFlag = 0; innerId.dlpFlag = static_cast(dlpFlag); innerId.tokenUniqueID = rand & TOKEN_RANDOM_MASK; - AccessTokenID tokenId = *reinterpret_cast(&innerId); + AccessTokenID tokenId = *reinterpret_cast(&innerId); return tokenId; } diff --git a/services/privacymanager/src/sensitive/audio_manager/audio_manager_adapter.cpp b/services/privacymanager/src/sensitive/audio_manager/audio_manager_adapter.cpp index fc68bdbd5..695b57716 100644 --- a/services/privacymanager/src/sensitive/audio_manager/audio_manager_adapter.cpp +++ b/services/privacymanager/src/sensitive/audio_manager/audio_manager_adapter.cpp @@ -28,7 +28,7 @@ namespace AccessToken { AudioManagerAdapter& AudioManagerAdapter::GetInstance() { - static AudioManagerAdapter *instance = new (std::nothrow) AudioManagerAdapter(); + static AudioManagerAdapter* instance = new (std::nothrow) AudioManagerAdapter(); return *instance; } diff --git a/services/privacymanager/src/sensitive/camera_manager/camera_manager_adapter.cpp b/services/privacymanager/src/sensitive/camera_manager/camera_manager_adapter.cpp index fb2da54d1..5d3aa18c4 100644 --- a/services/privacymanager/src/sensitive/camera_manager/camera_manager_adapter.cpp +++ b/services/privacymanager/src/sensitive/camera_manager/camera_manager_adapter.cpp @@ -29,7 +29,7 @@ static constexpr int32_t CAMERA_IS_CAMERA_MUTED_IPC_CODE = 13; CameraManagerAdapter& CameraManagerAdapter::GetInstance() { - static CameraManagerAdapter *instance = new (std::nothrow) CameraManagerAdapter(); + static CameraManagerAdapter* instance = new (std::nothrow) CameraManagerAdapter(); return *instance; } diff --git a/services/tokensyncmanager/src/command/base_remote_command.cpp b/services/tokensyncmanager/src/command/base_remote_command.cpp index b78f83703..52732976c 100644 --- a/services/tokensyncmanager/src/command/base_remote_command.cpp +++ b/services/tokensyncmanager/src/command/base_remote_command.cpp @@ -43,6 +43,9 @@ static const std::string JSON_DLP_TYPE = "dlpType"; void BaseRemoteCommand::FromRemoteProtocolJson(const CJson* jsonObject) { + if (jsonObject == nullptr) { + return; + } GetStringFromJson(jsonObject, JSON_COMMAND_NAME, remoteProtocol_.commandName); GetStringFromJson(jsonObject, JSON_UNIQUEID, remoteProtocol_.uniqueId); GetIntFromJson(jsonObject, JSON_REQUEST_VERSION, remoteProtocol_.requestVersion); @@ -83,14 +86,14 @@ CJsonUnique BaseRemoteCommand::ToNativeTokenInfoJson(const NativeTokenInfoBase& } CJsonUnique DcapsJson = CreateJsonArray(); for (const auto& item : tokenInfo.dcap) { - cJSON *tmpObj = cJSON_CreateString(item.c_str()); + cJSON* tmpObj = cJSON_CreateString(item.c_str()); AddObjToArray(DcapsJson.get(), tmpObj); cJSON_Delete(tmpObj); tmpObj = nullptr; } CJsonUnique NativeAclsJson = CreateJsonArray(); for (const auto& item : tokenInfo.nativeAcls) { - cJSON *tmpObj = cJSON_CreateString(item.c_str()); + cJSON* tmpObj = cJSON_CreateString(item.c_str()); AddObjToArray(NativeAclsJson.get(), tmpObj); cJSON_Delete(tmpObj); tmpObj = nullptr; @@ -109,6 +112,9 @@ CJsonUnique BaseRemoteCommand::ToNativeTokenInfoJson(const NativeTokenInfoBase& void BaseRemoteCommand::ToPermStateJson(cJSON* permStateJson, const PermissionStatus& state) { + if (permStateJson == nullptr) { + return; + } AddStringToJson(permStateJson, "permissionName", state.permissionName); AddIntToJson(permStateJson, "grantStatus", state.grantStatus); AddUnsignedIntToJson(permStateJson, "grantFlag", state.grantFlag); @@ -151,11 +157,14 @@ void BaseRemoteCommand::FromHapTokenBasicInfoJson(const cJSON* hapTokenJson, void BaseRemoteCommand::FromPermStateListJson(const cJSON* hapTokenJson, std::vector& permStateList) { - cJSON *jsonObjTmp = GetArrayFromJson(hapTokenJson, "permState"); + if (hapTokenJson == nullptr) { + return; + } + cJSON* jsonObjTmp = GetArrayFromJson(hapTokenJson, "permState"); if (jsonObjTmp != nullptr) { int len = cJSON_GetArraySize(jsonObjTmp); for (int i = 0; i < len; i++) { - cJSON *permissionJson = cJSON_GetArrayItem(jsonObjTmp, i); + cJSON* permissionJson = cJSON_GetArrayItem(jsonObjTmp, i); PermissionStatus permission; if (!GetStringFromJson(permissionJson, "permissionName", permission.permissionName)) { continue; @@ -174,6 +183,9 @@ void BaseRemoteCommand::FromPermStateListJson(const cJSON* hapTokenJson, void BaseRemoteCommand::FromHapTokenInfoJson(const cJSON* hapTokenJson, HapTokenInfoForSync& hapTokenInfo) { + if (nativeTokenJson == nullptr) { + return; + } FromHapTokenBasicInfoJson(hapTokenJson, hapTokenInfo.baseInfo); if (hapTokenInfo.baseInfo.tokenID == 0) { LOGE(ATM_DOMAIN, ATM_TAG, "Hap token basic info is error."); @@ -185,6 +197,9 @@ void BaseRemoteCommand::FromHapTokenInfoJson(const cJSON* hapTokenJson, void BaseRemoteCommand::FromNativeTokenInfoJson(const cJSON* nativeTokenJson, NativeTokenInfoBase& nativeTokenInfo) { + if (nativeTokenJson == nullptr) { + return; + } GetStringFromJson(nativeTokenJson, "processName", nativeTokenInfo.processName); int32_t apl; GetIntFromJson(nativeTokenJson, "apl", apl); @@ -197,9 +212,9 @@ void BaseRemoteCommand::FromNativeTokenInfoJson(const cJSON* nativeTokenJson, GetUnsignedIntFromJson(nativeTokenJson, "tokenId", nativeTokenInfo.tokenID); GetUnsignedIntFromJson(nativeTokenJson, "tokenAttr", nativeTokenInfo.tokenAttr); - cJSON *dcapsJson = GetArrayFromJson(nativeTokenJson, "dcaps"); + cJSON* dcapsJson = GetArrayFromJson(nativeTokenJson, "dcaps"); if (dcapsJson != nullptr) { - CJson *dcap = nullptr; + CJson* dcap = nullptr; std::vector dcaps; cJSON_ArrayForEach(dcap, dcapsJson) { std::string item = cJSON_GetStringValue(dcap); @@ -207,9 +222,9 @@ void BaseRemoteCommand::FromNativeTokenInfoJson(const cJSON* nativeTokenJson, } nativeTokenInfo.dcap = dcaps; } - cJSON *nativeAclsJson = GetArrayFromJson(nativeTokenJson, "nativeAcls"); + cJSON* nativeAclsJson = GetArrayFromJson(nativeTokenJson, "nativeAcls"); if (nativeAclsJson != nullptr) { - CJson *acl = nullptr; + CJson* acl = nullptr; std::vector nativeAcls; cJSON_ArrayForEach(acl, nativeAclsJson) { std::string item = cJSON_GetStringValue(acl); diff --git a/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp b/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp index 2ad94ec48..fe7176cd3 100644 --- a/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp +++ b/services/tokensyncmanager/src/command/sync_remote_hap_token_command.cpp @@ -62,7 +62,7 @@ SyncRemoteHapTokenCommand::SyncRemoteHapTokenCommand(const std::string &json) BaseRemoteCommand::FromRemoteProtocolJson(jsonObject.get()); GetUnsignedIntFromJson(jsonObject, "requestTokenId", requestTokenId_); - CJson *hapTokenJson = GetObjFromJson(jsonObject, "HapTokenInfo"); + CJson* hapTokenJson = GetObjFromJson(jsonObject, "HapTokenInfo"); if (hapTokenJson != nullptr) { BaseRemoteCommand::FromHapTokenInfoJson(hapTokenJson, hapTokenInfo_); } diff --git a/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp b/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp index cd1ce38f8..a6a7c778b 100644 --- a/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp +++ b/services/tokensyncmanager/src/command/update_remote_hap_token_command.cpp @@ -47,7 +47,7 @@ UpdateRemoteHapTokenCommand::UpdateRemoteHapTokenCommand(const std::string &json } BaseRemoteCommand::FromRemoteProtocolJson(jsonObject.get()); - CJson *hapTokenJson = GetObjFromJson(jsonObject, "HapTokenInfos"); + CJson* hapTokenJson = GetObjFromJson(jsonObject, "HapTokenInfos"); if (hapTokenJson != nullptr) { BaseRemoteCommand::FromHapTokenInfoJson(hapTokenJson, updateTokenInfo_); } diff --git a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp index b1e0cda89..386b374fd 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_channel.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_channel.cpp @@ -184,7 +184,7 @@ std::string SoftBusChannel::ExecuteCommand(const std::string &commandName, const std::string uuid = GetUuid(); int len = static_cast(RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length()); - unsigned char *buf = new (std::nothrow) unsigned char[len + 1]; + unsigned char* buf = new (std::nothrow) unsigned char[len + 1]; if (buf == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "No enough memory: %{public}d", len); return ""; @@ -222,7 +222,7 @@ std::string SoftBusChannel::ExecuteCommand(const std::string &commandName, const return responseResult_; } -void SoftBusChannel::HandleDataReceived(int socket, const unsigned char *bytes, int length) +void SoftBusChannel::HandleDataReceived(int socket, const unsigned char* bytes, int length) { LOGD(ATM_DOMAIN, ATM_TAG, "HandleDataReceived"); #ifdef DEBUG_API_PERFORMANCE @@ -281,7 +281,7 @@ int SoftBusChannel::PrepareBytes(const std::string &type, const std::string &id, return Compress(json, info.bytes, info.bytesLength); } -int SoftBusChannel::Compress(const std::string &json, const unsigned char *compressedBytes, int &compressedLength) +int SoftBusChannel::Compress(const std::string &json, const unsigned char* compressedBytes, int &compressedLength) { uLong len = compressBound(json.size()); // length will not so that long @@ -292,8 +292,8 @@ int SoftBusChannel::Compress(const std::string &json, const unsigned char *compr return Constant::FAILURE; } - int result = compress(const_cast(compressedBytes), &len, - reinterpret_cast(const_cast(json.c_str())), json.size() + 1); + int result = compress(const_cast(compressedBytes), &len, + reinterpret_cast(const_cast(json.c_str())), json.size() + 1); if (result != Z_OK) { LOGE(ATM_DOMAIN, ATM_TAG, "Compress failed! error code: %{public}d", result); return result; @@ -304,17 +304,17 @@ int SoftBusChannel::Compress(const std::string &json, const unsigned char *compr return Constant::SUCCESS; } -std::string SoftBusChannel::Decompress(const unsigned char *bytes, const int length) +std::string SoftBusChannel::Decompress(const unsigned char* bytes, const int length) { LOGD(ATM_DOMAIN, ATM_TAG, "Input length: %{public}d", length); uLong len = RPC_TRANSFER_BYTES_MAX_LENGTH; - unsigned char *buf = new (std::nothrow) unsigned char[len + 1]; + unsigned char* buf = new (std::nothrow) unsigned char[len + 1]; if (buf == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "No enough memory!"); return ""; } (void)memset_s(buf, len + 1, 0, len + 1); - int result = uncompress(buf, &len, const_cast(bytes), length); + int result = uncompress(buf, &len, const_cast(bytes), length); if (result != Z_OK) { LOGE(ATM_DOMAIN, ATM_TAG, "uncompress failed, error code: %{public}d, bound length: %{public}d, buffer length: %{public}d", result, @@ -323,12 +323,12 @@ std::string SoftBusChannel::Decompress(const unsigned char *bytes, const int len return ""; } buf[len] = '\0'; - std::string str(reinterpret_cast(buf)); + std::string str(reinterpret_cast(buf)); delete[] buf; return str; } -int SoftBusChannel::SendRequestBytes(const unsigned char *bytes, const int bytesLength) +int SoftBusChannel::SendRequestBytes(const unsigned char* bytes, const int bytesLength) { if (bytesLength == 0) { LOGE(ATM_DOMAIN, ATM_TAG, "Bytes data is invalid."); @@ -395,7 +395,7 @@ void SoftBusChannel::HandleRequest(int socket, const std::string &id, const std: LOGW(ATM_DOMAIN, ATM_TAG, "Command %{public}s cannot get from json", commandName.c_str()); int sendlen = static_cast(RPC_TRANSFER_HEAD_BYTES_LENGTH + jsonPayload.length()); - unsigned char *sendbuf = new (std::nothrow) unsigned char[sendlen + 1]; + unsigned char* sendbuf = new (std::nothrow) unsigned char[sendlen + 1]; if (sendbuf == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "No enough memory: %{public}d", sendlen); return; @@ -424,7 +424,7 @@ void SoftBusChannel::HandleRequest(int socket, const std::string &id, const std: // send result back std::string resultJsonPayload = command->ToJsonPayload(); int len = static_cast(RPC_TRANSFER_HEAD_BYTES_LENGTH + resultJsonPayload.length()); - unsigned char *buf = new (std::nothrow) unsigned char[len + 1]; + unsigned char* buf = new (std::nothrow) unsigned char[len + 1]; if (buf == nullptr) { LOGE(ATM_DOMAIN, ATM_TAG, "No enough memory: %{public}d", len); return; @@ -453,7 +453,7 @@ void SoftBusChannel::HandleResponse(const std::string &id, const std::string &js } } -int SoftBusChannel::SendResponseBytes(int socket, const unsigned char *bytes, const int bytesLength) +int SoftBusChannel::SendResponseBytes(int socket, const unsigned char* bytes, const int bytesLength) { LOGD(ATM_DOMAIN, ATM_TAG, "Send len (after compress len)= %{public}d", bytesLength); int result = ::SendBytes(socket, bytes, bytesLength); diff --git a/services/tokensyncmanager/src/remote/soft_bus_socket_listener.cpp b/services/tokensyncmanager/src/remote/soft_bus_socket_listener.cpp index 61a921a9a..ec07bb704 100644 --- a/services/tokensyncmanager/src/remote/soft_bus_socket_listener.cpp +++ b/services/tokensyncmanager/src/remote/soft_bus_socket_listener.cpp @@ -95,7 +95,7 @@ bool SoftBusSocketListener::GetNetworkIdBySocket(const int32_t socket, std::stri return false; } -void SoftBusSocketListener::OnClientBytes(int32_t socket, const void *data, uint32_t dataLen) +void SoftBusSocketListener::OnClientBytes(int32_t socket, const void* data, uint32_t dataLen) { LOGI(ATM_DOMAIN, ATM_TAG, "Socket fd %{public}d, recv len %{public}d.", socket, dataLen); @@ -117,10 +117,10 @@ void SoftBusSocketListener::OnClientBytes(int32_t socket, const void *data, uint LOGE(ATM_DOMAIN, ATM_TAG, "GetExecutorChannel failed"); return; } - channel->HandleDataReceived(socket, static_cast(const_cast(data)), dataLen); + channel->HandleDataReceived(socket, static_cast(const_cast(data)), dataLen); } -void SoftBusSocketListener::OnServiceBytes(int32_t socket, const void *data, uint32_t dataLen) +void SoftBusSocketListener::OnServiceBytes(int32_t socket, const void* data, uint32_t dataLen) { LOGI(ATM_DOMAIN, ATM_TAG, "Socket fd %{public}d, recv len %{public}d.", socket, dataLen); @@ -138,7 +138,7 @@ void SoftBusSocketListener::OnServiceBytes(int32_t socket, const void *data, uin LOGE(ATM_DOMAIN, ATM_TAG, "GetExecutorChannel failed"); return; } - channel->HandleDataReceived(socket, static_cast(const_cast(data)), dataLen); + channel->HandleDataReceived(socket, static_cast(const_cast(data)), dataLen); } else { LOGE(ATM_DOMAIN, ATM_TAG, "Unkonow socket."); } diff --git a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp index dcf5f4c82..4bc7bfa16 100644 --- a/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp +++ b/services/tokensyncmanager/src/service/token_sync_manager_stub.cpp @@ -62,7 +62,7 @@ int32_t TokenSyncManagerStub::OnRemoteRequest( bool TokenSyncManagerStub::IsNativeProcessCalling() const { AccessTokenID tokenCaller = IPCSkeleton::GetCallingTokenID(); - uint32_t type = (reinterpret_cast(&tokenCaller))->type; + uint32_t type = (reinterpret_cast(&tokenCaller))->type; LOGD(ATM_DOMAIN, ATM_TAG, "Calling type: %{public}d", type); return type == TOKEN_NATIVE; } diff --git a/services/tokensyncmanager/test/unittest/token_sync_service_test.cpp b/services/tokensyncmanager/test/unittest/token_sync_service_test.cpp index 9df60367e..766cf8c0d 100644 --- a/services/tokensyncmanager/test/unittest/token_sync_service_test.cpp +++ b/services/tokensyncmanager/test/unittest/token_sync_service_test.cpp @@ -487,13 +487,17 @@ HWTEST_F(TokenSyncServiceTest, FromPermStateListJson001, TestSize.Level0) hapTokenJson = cmd->ToHapTokenInfosJson(remoteTokenInfo); HapTokenInfoForSync hap; + cmd->FromHapTokenBasicInfoJson(nullptr, hap.baseInfo); cmd->FromHapTokenBasicInfoJson(hapTokenJson.get(), hap.baseInfo); + + cmd->FromPermStateListJson(nullptr, hap.permStateList); cmd->FromPermStateListJson(hapTokenJson.get(), hap.permStateList); PermissionStatus state1 = { .permissionName = "ohos.permission.test1", .grantStatus = PermissionState::PERMISSION_GRANTED, .grantFlag = PermissionFlag::PERMISSION_SYSTEM_FIXED}; + cmd->ToPermStateJson(nullptr, state1); CJsonUnique permStateJson = CreateJson(); cmd->ToPermStateJson(permStateJson.get(), state1); @@ -518,6 +522,7 @@ HWTEST_F(TokenSyncServiceTest, FromNativeTokenInfoJson001, TestSize.Level0) CJsonUnique nativeTokenListJsonNull = CreateJson(); NativeTokenInfoBase tokenNull; + cmd->FromNativeTokenInfoJson(nullptr, tokenNull); cmd->FromNativeTokenInfoJson(nativeTokenListJsonNull.get(), tokenNull); CJsonUnique hapTokenJsonNull = CreateJson(); -- Gitee