From 85f20ecc4846e86245a7820f2f0639b3ae8a2dc0 Mon Sep 17 00:00:00 2001 From: winnie-hu Date: Mon, 26 Sep 2022 11:26:11 +0800 Subject: [PATCH] fixed cb43112 from https://gitee.com/winnie-hu/security_crypto_framework/pulls/46 add argc init and set num to argv size Signed-off-by: winnie-hu --- frameworks/js/napi/src/napi_asy_key_generator.cpp | 10 +++++----- frameworks/js/napi/src/napi_key_agreement.cpp | 4 ++-- frameworks/js/napi/src/napi_mac.cpp | 2 +- frameworks/js/napi/src/napi_md.cpp | 6 +++--- frameworks/js/napi/src/napi_rand.cpp | 6 +++--- frameworks/js/napi/src/napi_sign.cpp | 12 ++++++------ frameworks/js/napi/src/napi_verify.cpp | 12 ++++++------ 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/frameworks/js/napi/src/napi_asy_key_generator.cpp b/frameworks/js/napi/src/napi_asy_key_generator.cpp index af3eda1..98388d8 100644 --- a/frameworks/js/napi/src/napi_asy_key_generator.cpp +++ b/frameworks/js/napi/src/napi_asy_key_generator.cpp @@ -109,7 +109,7 @@ static bool BuildGenKeyPairCtx(napi_env env, napi_callback_info info, GenKeyPair { napi_value thisVar = nullptr; size_t expectedArgc = PARAMS_NUM_ONE; - size_t argc; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_ONE] = { nullptr }; napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr); if (argc != expectedArgc && argc != expectedArgc - 1) { @@ -173,7 +173,7 @@ static bool BuildConvertKeyCtx(napi_env env, napi_callback_info info, ConvertKey { napi_value thisVar = nullptr; size_t expectedArgc = PARAMS_NUM_THREE; - size_t argc; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_THREE] = { nullptr }; napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr); if (argc != expectedArgc && argc != expectedArgc - 1) { @@ -465,12 +465,12 @@ napi_value NapiAsyKeyGenerator::AsyKeyGeneratorConstructor(napi_env env, napi_ca napi_value NapiAsyKeyGenerator::CreateJsAsyKeyGenerator(napi_env env, napi_callback_info info) { LOGI("enter ..."); - size_t exceptedArgc = PARAMS_NUM_ONE; - size_t argc; + size_t expectedArgc = PARAMS_NUM_ONE; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_ONE] = { nullptr }; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); - if (argc != exceptedArgc) { + if (argc != expectedArgc) { LOGE("The input args num is invalid."); return NapiGetNull(env); } diff --git a/frameworks/js/napi/src/napi_key_agreement.cpp b/frameworks/js/napi/src/napi_key_agreement.cpp index 85a3c15..1d078ce 100644 --- a/frameworks/js/napi/src/napi_key_agreement.cpp +++ b/frameworks/js/napi/src/napi_key_agreement.cpp @@ -74,7 +74,7 @@ static bool BuildKeyAgreementJsCtx(napi_env env, napi_callback_info info, KeyAgr { napi_value thisVar = nullptr; size_t expectedArgc = PARAMS_NUM_THREE; - size_t argc; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_THREE] = { nullptr }; napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr); if (argc != expectedArgc && argc != expectedArgc - 1) { @@ -255,7 +255,7 @@ napi_value NapiKeyAgreement::CreateJsKeyAgreement(napi_env env, napi_callback_in { LOGI("enter ..."); size_t exceptedArgc = PARAMS_NUM_ONE; - size_t argc; + size_t argc = PARAMS_NUM_ONE; napi_value argv[PARAMS_NUM_ONE] = { nullptr }; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); diff --git a/frameworks/js/napi/src/napi_mac.cpp b/frameworks/js/napi/src/napi_mac.cpp index 41a2581..a8eeb0b 100644 --- a/frameworks/js/napi/src/napi_mac.cpp +++ b/frameworks/js/napi/src/napi_mac.cpp @@ -417,7 +417,7 @@ napi_value NapiMac::MacConstructor(napi_env env, napi_callback_info info) napi_value NapiMac::CreateMac(napi_env env, napi_callback_info info) { size_t exceptedArgc = ARGS_SIZE_ONE; - size_t argc; + size_t argc = expectedArgc; napi_value argv[ARGS_SIZE_ONE] = { 0 }; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); if (argc != exceptedArgc) { diff --git a/frameworks/js/napi/src/napi_md.cpp b/frameworks/js/napi/src/napi_md.cpp index 4c84f6d..902e994 100644 --- a/frameworks/js/napi/src/napi_md.cpp +++ b/frameworks/js/napi/src/napi_md.cpp @@ -323,11 +323,11 @@ napi_value NapiMd::MdConstructor(napi_env env, napi_callback_info info) napi_value NapiMd::CreateMd(napi_env env, napi_callback_info info) { - size_t exceptedArgc = ARGS_SIZE_ONE; - size_t argc; + size_t expectedArgc = ARGS_SIZE_ONE; + size_t argc = expectedArgc; napi_value argv[ARGS_SIZE_ONE] = { 0 }; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); - if (argc != exceptedArgc) { + if (argc != expectedArgc) { LOGE("The input args num is invalid."); return nullptr; } diff --git a/frameworks/js/napi/src/napi_rand.cpp b/frameworks/js/napi/src/napi_rand.cpp index aa16244..7458927 100644 --- a/frameworks/js/napi/src/napi_rand.cpp +++ b/frameworks/js/napi/src/napi_rand.cpp @@ -310,10 +310,10 @@ napi_value NapiRand::RandConstructor(napi_env env, napi_callback_info info) napi_value NapiRand::CreateRand(napi_env env, napi_callback_info info) { - size_t exceptedArgc = ARGS_SIZE_ZERO; - size_t argc; + size_t expectedArgc = ARGS_SIZE_ZERO; + size_t argc = expectedArgc; napi_get_cb_info(env, info, &argc, nullptr, nullptr, nullptr); - if (argc != exceptedArgc) { + if (argc != expectedArgc) { LOGE("The input args num is invalid."); return nullptr; } diff --git a/frameworks/js/napi/src/napi_sign.cpp b/frameworks/js/napi/src/napi_sign.cpp index 94cc8ac..a3e1208 100644 --- a/frameworks/js/napi/src/napi_sign.cpp +++ b/frameworks/js/napi/src/napi_sign.cpp @@ -142,7 +142,7 @@ static bool BuildSignJsInitCtx(napi_env env, napi_callback_info info, SignInitCt { napi_value thisVar = nullptr; size_t expectedArgc = PARAMS_NUM_TWO; - size_t argc; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_TWO] = { nullptr, nullptr }; napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr); if (argc != expectedArgc && argc != expectedArgc - 1) { @@ -185,7 +185,7 @@ static bool BuildSignJsUpdateCtx(napi_env env, napi_callback_info info, SignUpda { napi_value thisVar = nullptr; size_t expectedArgc = PARAMS_NUM_TWO; - size_t argc; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_TWO] = { nullptr, nullptr }; napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr); if ((argc != expectedArgc) && (argc != expectedArgc - 1)) { @@ -226,7 +226,7 @@ static bool BuildSignJsDoFinalCtx(napi_env env, napi_callback_info info, SignDoF { napi_value thisVar = nullptr; size_t expectedArgc = PARAMS_NUM_TWO; - size_t argc; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_TWO] = { nullptr, nullptr }; napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr); if ((argc != expectedArgc) && (argc != expectedArgc - 1)) { @@ -593,12 +593,12 @@ napi_value NapiSign::SignConstructor(napi_env env, napi_callback_info info) napi_value NapiSign::CreateJsSign(napi_env env, napi_callback_info info) { LOGI("enter ..."); - size_t exceptedArgc = PARAMS_NUM_ONE; - size_t argc; + size_t expectedArgc = PARAMS_NUM_ONE; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_ONE] = { nullptr }; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); - if (argc != exceptedArgc) { + if (argc != expectedArgc) { LOGE("The input args num is invalid."); return nullptr; } diff --git a/frameworks/js/napi/src/napi_verify.cpp b/frameworks/js/napi/src/napi_verify.cpp index 1c42170..98ad0e9 100644 --- a/frameworks/js/napi/src/napi_verify.cpp +++ b/frameworks/js/napi/src/napi_verify.cpp @@ -142,7 +142,7 @@ static bool BuildVerifyJsInitCtx(napi_env env, napi_callback_info info, VerifyIn { napi_value thisVar = nullptr; size_t expectedArgc = PARAMS_NUM_TWO; - size_t argc; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_TWO] = { nullptr, nullptr }; napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr); if ((argc != expectedArgc) && (argc != expectedArgc - 1)) { @@ -185,7 +185,7 @@ static bool BuildVerifyJsUpdateCtx(napi_env env, napi_callback_info info, Verify { napi_value thisVar = nullptr; size_t expectedArgc = PARAMS_NUM_TWO; - size_t argc; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_TWO] = { nullptr, nullptr }; napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr); if ((argc != expectedArgc) && (argc != expectedArgc - 1)) { @@ -255,7 +255,7 @@ static bool BuildVerifyJsDoFinalCtx(napi_env env, napi_callback_info info, Verif { napi_value thisVar = nullptr; size_t expectedArgc = PARAMS_NUM_THREE; - size_t argc; + size_t argc= expectedArgc; napi_value argv[PARAMS_NUM_THREE] = { nullptr, nullptr, nullptr }; napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr); if ((argc != expectedArgc) && (argc != expectedArgc - 1)) { @@ -616,12 +616,12 @@ napi_value NapiVerify::VerifyConstructor(napi_env env, napi_callback_info info) napi_value NapiVerify::CreateJsVerify(napi_env env, napi_callback_info info) { LOGI("enter ..."); - size_t exceptedArgc = PARAMS_NUM_ONE; - size_t argc; + size_t expectedArgc = PARAMS_NUM_ONE; + size_t argc = expectedArgc; napi_value argv[PARAMS_NUM_ONE] = { nullptr }; napi_get_cb_info(env, info, &argc, argv, nullptr, nullptr); - if (argc != exceptedArgc) { + if (argc != expectedArgc) { LOGE("The input args num is invalid."); return nullptr; } -- Gitee