对StartTrace第三个参数进行null校验

Signed-off-by: chenwei <chenwei469@huawei.com>
This commit is contained in:
chenwei
2023-05-09 17:42:01 +08:00
parent 692c26e6c6
commit e96d4549bd
@@ -55,7 +55,7 @@ bool TypeCheck(const napi_env& env, const napi_value& value, const napi_valuetyp
bool ParseStringParam(const napi_env& env, const napi_value& value, std::string& dest)
{
if (!TypeCheck(env, value, napi_string)) {
if (!TypeCheck(env, value, napi_string) && !TypeCheck(env, value, napi_number) && !TypeCheck(env, value, napi_undefined)) {
return false;
}
constexpr int nameMaxSize = 1024;
@@ -128,7 +128,7 @@ static napi_value JSTraceStart(napi_env env, napi_callback_info info)
size_t argc = ARGC_NUMBER_THREE;
napi_value argv[ARGC_NUMBER_THREE];
ParseParams(env, info, argc, argv);
NAPI_ASSERT(env, argc == ARGC_NUMBER_TWO || argc == ARGC_NUMBER_THREE, "Wrong number of arguments");
NAPI_ASSERT(env, argc >= ARGC_NUMBER_TWO, "Wrong number of arguments");
if (argc != ARGC_NUMBER_TWO && argc != ARGC_NUMBER_THREE) {
HiLog::Error(LABEL, "Wrong number of parameters.");
}
@@ -160,7 +160,7 @@ static napi_value JSTraceFinish(napi_env env, napi_callback_info info)
napi_value argv[ARGC_NUMBER_TWO];
napi_value thisVar;
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, argv, &thisVar, NULL));
NAPI_ASSERT(env, argc == ARGC_NUMBER_TWO, "Wrong number of arguments");
NAPI_ASSERT(env, argc >= ARGC_NUMBER_TWO, "Wrong number of arguments");
(void)JsStrNumParamsFunc(env, info, [&env] (std::string name, napi_value& nValue) -> bool {
int taskId = 0;
if (!ParseInt32Param(env, nValue, taskId)) {