Skip to content

C
communication_ipc

OpenHarmony / communication_ipc
大约 1 年 前同步成功

通知 20
Star 3
Fork 0
C
communication_ipc

体验新版 GitCode，发现更多精彩内容 >>

提交 d1121039 编写于 作者: W wanderer-dl122
浏览文件
操作

修复编译告警 

Signed-off-by: Nwanderer-dl122 <dengliang21@huawei.com>
上级 cb3e1f9e
隐藏空白更改
内联 并排
Showing with 12 addition and 12 deletion
ipc/native/src/napi_common/source/napi_ashmem.cpp
浏览文件 @ d1121039
...@@ -403,9 +403,9 @@ napi_value NAPIAshmem::ReadFromAshmem(napi_env env, napi_callback_info info) ...@@ -403,9 +403,9 @@ napi_value NAPIAshmem::ReadFromAshmem(napi_env env, napi_callback_info info)
napi_unwrap(env, thisVar, (void **)&napiAshmem); napi_unwrap(env, thisVar, (void **)&napiAshmem);
NAPI_ASSERT(env, napiAshmem != nullptr, "napiAshmem is null"); NAPI_ASSERT(env, napiAshmem != nullptr, "napiAshmem is null");
int32_t ashmemSize = napiAshmem->GetAshmem()->GetAshmemSize(); uint32_t ashmemSize = (uint32_t)napiAshmem->GetAshmem()->GetAshmemSize();
if (size < 0 || size > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 || if (size < 0 || (unsigned long)size > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 ||
offset < 0 || offset > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 || offset < 0 || (unsigned long)offset > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 ||
(size * BYTE_SIZE_32 + offset * BYTE_SIZE_32) > ashmemSize) { (size * BYTE_SIZE_32 + offset * BYTE_SIZE_32) > ashmemSize) {
ZLOGE(LOG_LABEL, "invalid parameter, size = %{public}jd, offset = %{public}jd", size, offset); ZLOGE(LOG_LABEL, "invalid parameter, size = %{public}jd, offset = %{public}jd", size, offset);
return nullptr; return nullptr;
...@@ -466,9 +466,9 @@ napi_value NAPIAshmem::ReadAshmem(napi_env env, napi_callback_info info) ...@@ -466,9 +466,9 @@ napi_value NAPIAshmem::ReadAshmem(napi_env env, napi_callback_info info)
ZLOGE(LOG_LABEL, "napiAshmem is null"); ZLOGE(LOG_LABEL, "napiAshmem is null");
return napiErr.ThrowError(env, OHOS::errorDesc::READ_FROM_ASHMEM_ERROR); return napiErr.ThrowError(env, OHOS::errorDesc::READ_FROM_ASHMEM_ERROR);
} }
int32_t ashmemSize = napiAshmem->GetAshmem()->GetAshmemSize(); uint32_t ashmemSize = (uint32_t)napiAshmem->GetAshmem()->GetAshmemSize();
if (size < 0 || size > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 || if (size < 0 || (unsigned long)size > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 ||
offset < 0 || offset > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 || offset < 0 || (unsigned long)offset > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 ||
(size * BYTE_SIZE_32 + offset * BYTE_SIZE_32) > ashmemSize) { (size * BYTE_SIZE_32 + offset * BYTE_SIZE_32) > ashmemSize) {
ZLOGE(LOG_LABEL, "invalid parameter, size = %{public}jd, offset = %{public}jd", size, offset); ZLOGE(LOG_LABEL, "invalid parameter, size = %{public}jd, offset = %{public}jd", size, offset);
return nullptr; return nullptr;
...@@ -618,9 +618,9 @@ napi_value NAPIAshmem::WriteToAshmem(napi_env env, napi_callback_info info) ...@@ -618,9 +618,9 @@ napi_value NAPIAshmem::WriteToAshmem(napi_env env, napi_callback_info info)
// need check size offset and capacity // need check size offset and capacity
napi_value napiValue = nullptr; napi_value napiValue = nullptr;
bool result = true; bool result = true;
int32_t ashmemSize = napiAshmem->GetAshmem()->GetAshmemSize(); uint32_t ashmemSize = (uint32_t)napiAshmem->GetAshmem()->GetAshmemSize();
if (size < 0 || size > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 || if (size < 0 || (unsigned long)size > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 ||
offset < 0 || offset > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 || offset < 0 || (unsigned long)offset > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 ||
(size * BYTE_SIZE_32 + offset * BYTE_SIZE_32) > ashmemSize) { (size * BYTE_SIZE_32 + offset * BYTE_SIZE_32) > ashmemSize) {
ZLOGE(LOG_LABEL, "invalid parameter, size = %{public}jd, offset = %{public}jd", size, offset); ZLOGE(LOG_LABEL, "invalid parameter, size = %{public}jd, offset = %{public}jd", size, offset);
result = false; result = false;
...@@ -674,9 +674,9 @@ napi_value NAPIAshmem::WriteAshmem(napi_env env, napi_callback_info info) ...@@ -674,9 +674,9 @@ napi_value NAPIAshmem::WriteAshmem(napi_env env, napi_callback_info info)
} }
// need check size offset and capacity // need check size offset and capacity
int32_t ashmemSize = napiAshmem->GetAshmem()->GetAshmemSize(); uint32_t ashmemSize = (uint32_t)napiAshmem->GetAshmem()->GetAshmemSize();
if (size < 0 || size > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 || if (size < 0 || (unsigned long)size > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 ||
offset < 0 || offset > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 || offset < 0 || (unsigned long)offset > std::numeric_limits<int32_t>::max() / BYTE_SIZE_32 ||
(size * BYTE_SIZE_32 + offset * BYTE_SIZE_32) > ashmemSize) { (size * BYTE_SIZE_32 + offset * BYTE_SIZE_32) > ashmemSize) {
ZLOGE(LOG_LABEL, "invalid parameter, size = %{public}jd, offset = %{public}jd", size, offset); ZLOGE(LOG_LABEL, "invalid parameter, size = %{public}jd, offset = %{public}jd", size, offset);
return napiErr.ThrowError(env, OHOS::errorDesc::WRITE_TO_ASHMEM_ERROR); return napiErr.ThrowError(env, OHOS::errorDesc::WRITE_TO_ASHMEM_ERROR);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或