Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
communication_ipc
提交
3675a8fb
C
communication_ipc
项目概览
OpenHarmony
/
communication_ipc
12 个月 前同步成功
通知
20
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
communication_ipc
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
3675a8fb
编写于
6月 01, 2023
作者:
W
wanderer-dl122
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复编译告警
Signed-off-by:
N
wanderer-dl122
<
dengliang21@huawei.com
>
上级
d1121039
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
8 addition
and
8 deletion
+8
-8
ipc/native/src/napi_common/source/napi_ashmem.cpp
ipc/native/src/napi_common/source/napi_ashmem.cpp
+8
-8
未找到文件。
ipc/native/src/napi_common/source/napi_ashmem.cpp
浏览文件 @
3675a8fb
...
@@ -404,8 +404,8 @@ napi_value NAPIAshmem::ReadFromAshmem(napi_env env, napi_callback_info info)
...
@@ -404,8 +404,8 @@ napi_value NAPIAshmem::ReadFromAshmem(napi_env env, napi_callback_info info)
NAPI_ASSERT
(
env
,
napiAshmem
!=
nullptr
,
"napiAshmem is null"
);
NAPI_ASSERT
(
env
,
napiAshmem
!=
nullptr
,
"napiAshmem is null"
);
uint32_t
ashmemSize
=
(
uint32_t
)
napiAshmem
->
GetAshmem
()
->
GetAshmemSize
();
uint32_t
ashmemSize
=
(
uint32_t
)
napiAshmem
->
GetAshmem
()
->
GetAshmemSize
();
if
(
size
<
0
||
(
unsigned
long
)
size
>
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
||
if
(
size
<
0
||
size
>
(
int64_t
)(
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
)
||
offset
<
0
||
(
unsigned
long
)
offset
>
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
||
offset
<
0
||
offset
>
(
int64_t
)(
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
;
...
@@ -467,8 +467,8 @@ napi_value NAPIAshmem::ReadAshmem(napi_env env, napi_callback_info info)
...
@@ -467,8 +467,8 @@ napi_value NAPIAshmem::ReadAshmem(napi_env env, napi_callback_info info)
return
napiErr
.
ThrowError
(
env
,
OHOS
::
errorDesc
::
READ_FROM_ASHMEM_ERROR
);
return
napiErr
.
ThrowError
(
env
,
OHOS
::
errorDesc
::
READ_FROM_ASHMEM_ERROR
);
}
}
uint32_t
ashmemSize
=
(
uint32_t
)
napiAshmem
->
GetAshmem
()
->
GetAshmemSize
();
uint32_t
ashmemSize
=
(
uint32_t
)
napiAshmem
->
GetAshmem
()
->
GetAshmemSize
();
if
(
size
<
0
||
(
unsigned
long
)
size
>
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
||
if
(
size
<
0
||
size
>
(
int64_t
)(
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
)
||
offset
<
0
||
(
unsigned
long
)
offset
>
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
||
offset
<
0
||
offset
>
(
int64_t
)(
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
;
...
@@ -619,8 +619,8 @@ napi_value NAPIAshmem::WriteToAshmem(napi_env env, napi_callback_info info)
...
@@ -619,8 +619,8 @@ napi_value NAPIAshmem::WriteToAshmem(napi_env env, napi_callback_info info)
napi_value
napiValue
=
nullptr
;
napi_value
napiValue
=
nullptr
;
bool
result
=
true
;
bool
result
=
true
;
uint32_t
ashmemSize
=
(
uint32_t
)
napiAshmem
->
GetAshmem
()
->
GetAshmemSize
();
uint32_t
ashmemSize
=
(
uint32_t
)
napiAshmem
->
GetAshmem
()
->
GetAshmemSize
();
if
(
size
<
0
||
(
unsigned
long
)
size
>
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
||
if
(
size
<
0
||
size
>
(
int64_t
)(
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
)
||
offset
<
0
||
(
unsigned
long
)
offset
>
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
||
offset
<
0
||
offset
>
(
int64_t
)(
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
;
...
@@ -675,8 +675,8 @@ napi_value NAPIAshmem::WriteAshmem(napi_env env, napi_callback_info info)
...
@@ -675,8 +675,8 @@ napi_value NAPIAshmem::WriteAshmem(napi_env env, napi_callback_info info)
// need check size offset and capacity
// need check size offset and capacity
uint32_t
ashmemSize
=
(
uint32_t
)
napiAshmem
->
GetAshmem
()
->
GetAshmemSize
();
uint32_t
ashmemSize
=
(
uint32_t
)
napiAshmem
->
GetAshmem
()
->
GetAshmemSize
();
if
(
size
<
0
||
(
unsigned
long
)
size
>
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
||
if
(
size
<
0
||
size
>
(
int64_t
)(
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
)
||
offset
<
0
||
(
unsigned
long
)
offset
>
std
::
numeric_limits
<
int32_t
>::
max
()
/
BYTE_SIZE_32
||
offset
<
0
||
offset
>
(
int64_t
)(
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录