From f8bade4967de09b8aa38267cfb2082375ed5abd3 Mon Sep 17 00:00:00 2001 From: YinZong Date: Tue, 11 Feb 2025 02:40:51 +0000 Subject: [PATCH 1/2] update interfaces/kits/js/file_share/grant_permissions.cpp. Signed-off-by: YinZong --- interfaces/kits/js/file_share/grant_permissions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/interfaces/kits/js/file_share/grant_permissions.cpp b/interfaces/kits/js/file_share/grant_permissions.cpp index d0c3c1091..876791476 100644 --- a/interfaces/kits/js/file_share/grant_permissions.cpp +++ b/interfaces/kits/js/file_share/grant_permissions.cpp @@ -400,13 +400,13 @@ static bool CheckArgs(napi_env env, napi_callback_info info, NFuncArg& funcArg) } auto [succTokenId, tokenId] = NVal(env, funcArg[NARG_POS::FIRST]).ToInt32(); - if (!succTokenId || succTokenId == 0) { + if (!succTokenId || tokenId == 0) { LOGE("Failed to get tokenid or tokenid is 0"); return false; } auto [succPolicyType, policyType] = NVal(env, funcArg[NARG_POS::THIRD]).ToInt32(); - if (!succPolicyType || succPolicyType < TEMPORARY_TYPE || succPolicyType > PERSISTENT_TYPE) { + if (!succPolicyType || policyType < TEMPORARY_TYPE || policyType > PERSISTENT_TYPE) { LOGE("Failed to get policy type or policy type is invalid"); return false; } @@ -430,7 +430,7 @@ napi_value CheckPathPermission(napi_env env, napi_callback_info info) auto [succTokenId, tokenId] = NVal(env, funcArg[NARG_POS::FIRST]).ToInt32(); uint64_t callerTokenId = OHOS::IPCSkeleton::GetCallingTokenID(); - if (tokenId != callerTokenId) { + if (tokenId != static_cast(callerTokenId)) { if (!CheckTokenIdPermission(callerTokenId, "ohos.permission.CHECK_SANDBOX_POLICY")) { NError(E_PERMISSION).ThrowErr(env); return nullptr; -- Gitee From f9eb2346a61e348dd93b3227f03812a230ccf0c0 Mon Sep 17 00:00:00 2001 From: YinZong Date: Tue, 11 Feb 2025 06:50:44 +0000 Subject: [PATCH 2/2] update interfaces/kits/js/file_share/grant_permissions.cpp. Signed-off-by: YinZong --- interfaces/kits/js/file_share/grant_permissions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interfaces/kits/js/file_share/grant_permissions.cpp b/interfaces/kits/js/file_share/grant_permissions.cpp index 876791476..7b06a584e 100644 --- a/interfaces/kits/js/file_share/grant_permissions.cpp +++ b/interfaces/kits/js/file_share/grant_permissions.cpp @@ -429,7 +429,7 @@ napi_value CheckPathPermission(napi_env env, napi_callback_info info) auto [succTokenId, tokenId] = NVal(env, funcArg[NARG_POS::FIRST]).ToInt32(); - uint64_t callerTokenId = OHOS::IPCSkeleton::GetCallingTokenID(); + uint32_t callerTokenId = OHOS::IPCSkeleton::GetCallingTokenID(); if (tokenId != static_cast(callerTokenId)) { if (!CheckTokenIdPermission(callerTokenId, "ohos.permission.CHECK_SANDBOX_POLICY")) { NError(E_PERMISSION).ThrowErr(env); -- Gitee