From 5bebd9a56cd471d1bfa5d251b6b481b18c90e5fe Mon Sep 17 00:00:00 2001 From: fengjq Date: Tue, 27 Jun 2023 09:39:31 +0800 Subject: [PATCH] Eliminate security alerts for codes Signed-off-by: fengjq --- interfaces/kits/js/src/mod_fileio/properties/open.cpp | 4 ++-- .../kits/js/src/mod_fileio/properties/prop_n_exporter.cpp | 6 +++--- interfaces/kits/js/src/mod_fileio/properties/read_text.cpp | 2 +- interfaces/kits/js/src/mod_fs/common_func.cpp | 2 +- interfaces/kits/js/src/mod_fs/common_func.h | 2 +- interfaces/kits/js/src/mod_fs/properties/lstat.cpp | 2 +- interfaces/kits/js/src/mod_fs/properties/mkdtemp.cpp | 2 +- interfaces/kits/js/src/mod_fs/properties/open.cpp | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/interfaces/kits/js/src/mod_fileio/properties/open.cpp b/interfaces/kits/js/src/mod_fileio/properties/open.cpp index ad489c180..25d731c04 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/open.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/open.cpp @@ -48,8 +48,8 @@ napi_value Open::Sync(napi_env env, napi_callback_info info) unsigned int flags = O_RDONLY; if (funcArg.GetArgc() >= NARG_CNT::TWO) { - auto [succ, authFlags] = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32(O_RDONLY); - if (!succ || authFlags < 0) { + auto [succGetFlags, authFlags] = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32(O_RDONLY); + if (!succGetFlags || authFlags < 0) { UniError(EINVAL).ThrowErr(env, "Invalid flags"); return nullptr; } diff --git a/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.cpp b/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.cpp index 5f2dd809d..e046a6795 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/prop_n_exporter.cpp @@ -200,9 +200,9 @@ napi_value PropNExporter::Mkdir(napi_env env, napi_callback_info info) int32_t mode = MODE_RUO_RWX; if (funcArg.GetArgc() >= NARG_CNT::TWO) { - bool succ = false; - tie(succ, mode) = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32(mode); - if (!succ || mode < 0) { + bool succGetMode = false; + tie(succGetMode, mode) = NVal(env, funcArg[NARG_POS::SECOND]).ToInt32(mode); + if (!succGetMode || mode < 0) { UniError(EINVAL).ThrowErr(env, "Invalid mode"); return nullptr; } diff --git a/interfaces/kits/js/src/mod_fileio/properties/read_text.cpp b/interfaces/kits/js/src/mod_fileio/properties/read_text.cpp index bc07193c2..79e6b53f5 100644 --- a/interfaces/kits/js/src/mod_fileio/properties/read_text.cpp +++ b/interfaces/kits/js/src/mod_fileio/properties/read_text.cpp @@ -35,11 +35,11 @@ static tuple> GetReadTextArg(nap NVal op(env, argOption); int64_t position = -1; size_t len = 0; - bool succ = false; bool hasLen = false; unique_ptr encoding = nullptr; if (op.HasProp("position") && !op.GetProp("position").TypeIs(napi_undefined)) { + bool succ = false; tie(succ, position) = op.GetProp("position").ToInt64(); if (!succ || position < 0) { return { false, position, hasLen, len, nullptr }; diff --git a/interfaces/kits/js/src/mod_fs/common_func.cpp b/interfaces/kits/js/src/mod_fs/common_func.cpp index bbb5a8556..35119fd51 100644 --- a/interfaces/kits/js/src/mod_fs/common_func.cpp +++ b/interfaces/kits/js/src/mod_fs/common_func.cpp @@ -108,7 +108,7 @@ unsigned int CommonFunc::ConvertJsFlags(unsigned int &flags) return flagsABI; } -NVal CommonFunc::InstantiateStat(napi_env env, uv_stat_t &buf) +NVal CommonFunc::InstantiateStat(napi_env env, const uv_stat_t &buf) { napi_value objStat = NClass::InstantiateClass(env, StatNExporter::className_, {}); if (!objStat) { diff --git a/interfaces/kits/js/src/mod_fs/common_func.h b/interfaces/kits/js/src/mod_fs/common_func.h index 69e83e0d3..46821e21d 100644 --- a/interfaces/kits/js/src/mod_fs/common_func.h +++ b/interfaces/kits/js/src/mod_fs/common_func.h @@ -56,7 +56,7 @@ void InitOpenMode(napi_env env, napi_value exports); struct CommonFunc { static unsigned int ConvertJsFlags(unsigned int &flags); - static LibN::NVal InstantiateStat(napi_env env, uv_stat_t &buf); + static LibN::NVal InstantiateStat(napi_env env, const uv_stat_t &buf); #ifndef WIN_PLATFORM static LibN::NVal InstantiateStream(napi_env env, std::unique_ptr fp); #endif diff --git a/interfaces/kits/js/src/mod_fs/properties/lstat.cpp b/interfaces/kits/js/src/mod_fs/properties/lstat.cpp index 823e9603c..c0669fbd6 100644 --- a/interfaces/kits/js/src/mod_fs/properties/lstat.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/lstat.cpp @@ -61,7 +61,7 @@ napi_value Lstat::Sync(napi_env env, napi_callback_info info) return stat; } -static NError LstatExec(shared_ptr arg, string path) +static NError LstatExec(shared_ptr arg, const string &path) { std::unique_ptr lstat_req = { new (std::nothrow) uv_fs_t, CommonFunc::fs_req_cleanup }; diff --git a/interfaces/kits/js/src/mod_fs/properties/mkdtemp.cpp b/interfaces/kits/js/src/mod_fs/properties/mkdtemp.cpp index 541fdb6a5..8c8a4dc29 100755 --- a/interfaces/kits/js/src/mod_fs/properties/mkdtemp.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/mkdtemp.cpp @@ -59,7 +59,7 @@ napi_value Mkdtemp::Sync(napi_env env, napi_callback_info info) return NVal::CreateUTF8String(env, mkdtemp_req->path).val_; } -static NError MkdTempExec(shared_ptr arg, string path) +static NError MkdTempExec(shared_ptr arg, const string &path) { std::unique_ptr mkdtemp_req = { new uv_fs_t, CommonFunc::fs_req_cleanup }; diff --git a/interfaces/kits/js/src/mod_fs/properties/open.cpp b/interfaces/kits/js/src/mod_fs/properties/open.cpp index 9d1c5a929..943632a09 100644 --- a/interfaces/kits/js/src/mod_fs/properties/open.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/open.cpp @@ -106,18 +106,18 @@ static NVal InstantiateFile(napi_env env, int fd, string pathOrUri, bool isUri) #ifndef WIN_PLATFORM static string DealWithUriWithName(string str) { - static uint32_t MEET_COUNT = 6; + static uint32_t meetCount = 6; uint32_t count = 0; uint32_t index; for (index = 0; index < str.length(); index++) { if (str[index] == '/') { count++; } - if (count == MEET_COUNT) { + if (count == meetCount) { break; } } - if (count == MEET_COUNT) { + if (count == meetCount) { str = str.substr(0, index); } return str; -- Gitee