openharmony/communication_ipc
1
0
Fork 0
mirror of https://gitee.com/openharmony/communication_ipc synced 2024-11-27 01:51:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

writeByteArray去除对数组长度的校验

Browse Source 
Signed-off-by: xdx1921 <fengxu12@huawei.com>
This commit is contained in:
xdx1921 2024-06-29 16:35:54 +08:00
parent e19a37e3d3
commit 35fb046836
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ipc/native/src/napi_common/include/napi_message_sequence.h
View File

@ -114,7 +114,6 @@ private:
static napi_value JS_constructor(napi_env env, napi_callback_info info);
static void release(MessageParcel *parcel);
static napi_value JS_checkWriteByteArrayArgs(napi_env env, size_t argc, napi_value* argv, uint32_t &arrayLength);
static napi_value JS_checkWriteArrayArgs(napi_env env, size_t argc, napi_value* argv, uint32_t &arrayLength);
static napi_value JS_checkWriteStringArrayElement(napi_env env, napi_value* argv, size_t &index,
size_t &bufferSize, napi_value &element);

32
ipc/native/src/napi_common/source/napi_message_sequence_write.cpp
View File

@ -361,36 +361,6 @@ napi_value NAPI_MessageSequence::JS_writeChar(napi_env env, napi_callback_info i
return napiValue;
}
napi_value NAPI_MessageSequence::JS_checkWriteByteArrayArgs(napi_env env,
size_t argc,
napi_value* argv,
uint32_t &arrayLength)
{
if (argv == nullptr) {
ZLOGE(LOG_LABEL, "argv is nullptr");
return napiErr.ThrowError(env, errorDesc::CHECK_PARAM_ERROR);
}
if (argc != REQUIRED_ARGS_COUNT_1) {
ZLOGE(LOG_LABEL, "requires 1 parameter");
return napiErr.ThrowError(env, errorDesc::CHECK_PARAM_ERROR);
}
bool isArray = false;
napi_is_array(env, argv[ARGV_INDEX_0], &isArray);
if (!isArray) {
ZLOGE(LOG_LABEL, "type mismatch for parameter 1");
return napiErr.ThrowError(env, errorDesc::CHECK_PARAM_ERROR);
}
uint32_t maxBytesLen = MAX_BYTES_LENGTH;
napi_get_array_length(env, argv[ARGV_INDEX_0], &arrayLength);
if (arrayLength >= maxBytesLen) {
ZLOGE(LOG_LABEL, "write byte array length too large");
return napiErr.ThrowError(env, errorDesc::CHECK_PARAM_ERROR);
}
napi_value result = nullptr;
napi_get_undefined(env, &result);
return result;
}
napi_value NAPI_MessageSequence::JS_writeByteArray(napi_env env, napi_callback_info info)
{
size_t argc = 1;
@ -398,7 +368,7 @@ napi_value NAPI_MessageSequence::JS_writeByteArray(napi_env env, napi_callback_i
napi_value thisVar = nullptr;
napi_get_cb_info(env, info, &argc, argv, &thisVar, nullptr);
uint32_t arrayLength = 0;
napi_value checkArgsResult = JS_checkWriteByteArrayArgs(env, argc, argv, arrayLength);
napi_value checkArgsResult = JS_checkWriteArrayArgs(env, argc, argv, arrayLength);
if (checkArgsResult == nullptr) {
ZLOGE(LOG_LABEL, "checkArgsResult is null");
return checkArgsResult;