Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
06a4911c
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
06a4911c
编写于
10月 12, 2018
作者:
R
Ralf Jung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
run-time validation: accept undef in int arrays, as we do for ints
上级
b2ddd27c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
5 deletion
+10
-5
src/librustc_mir/interpret/memory.rs
src/librustc_mir/interpret/memory.rs
+4
-4
src/librustc_mir/interpret/validity.rs
src/librustc_mir/interpret/validity.rs
+6
-1
未找到文件。
src/librustc_mir/interpret/memory.rs
浏览文件 @
06a4911c
...
@@ -846,7 +846,7 @@ pub fn check_bytes(
...
@@ -846,7 +846,7 @@ pub fn check_bytes(
&
self
,
&
self
,
ptr
:
Scalar
<
M
::
PointerTag
>
,
ptr
:
Scalar
<
M
::
PointerTag
>
,
size
:
Size
,
size
:
Size
,
allow_ptr
:
bool
,
allow_ptr
_and_undef
:
bool
,
)
->
EvalResult
<
'tcx
>
{
)
->
EvalResult
<
'tcx
>
{
// Empty accesses don't need to be valid pointers, but they should still be non-NULL
// Empty accesses don't need to be valid pointers, but they should still be non-NULL
let
align
=
Align
::
from_bytes
(
1
,
1
)
.unwrap
();
let
align
=
Align
::
from_bytes
(
1
,
1
)
.unwrap
();
...
@@ -857,9 +857,9 @@ pub fn check_bytes(
...
@@ -857,9 +857,9 @@ pub fn check_bytes(
let
ptr
=
ptr
.to_ptr
()
?
;
let
ptr
=
ptr
.to_ptr
()
?
;
// Check bounds, align and relocations on the edges
// Check bounds, align and relocations on the edges
self
.get_bytes_with_undef_and_ptr
(
ptr
,
size
,
align
)
?
;
self
.get_bytes_with_undef_and_ptr
(
ptr
,
size
,
align
)
?
;
// Check undef
, and maybe
ptr
// Check undef
and
ptr
self
.check_defined
(
ptr
,
size
)
?
;
if
!
allow_ptr_and_undef
{
if
!
allow_ptr
{
self
.check_defined
(
ptr
,
size
)
?
;
self
.check_relocations
(
ptr
,
size
)
?
;
self
.check_relocations
(
ptr
,
size
)
?
;
}
}
Ok
(())
Ok
(())
...
...
src/librustc_mir/interpret/validity.rs
浏览文件 @
06a4911c
...
@@ -517,7 +517,12 @@ pub fn validate_operand(
...
@@ -517,7 +517,12 @@ pub fn validate_operand(
// reject it. However, that's good: We don't inherently want
// reject it. However, that's good: We don't inherently want
// to reject those pointers, we just do not have the machinery to
// to reject those pointers, we just do not have the machinery to
// talk about parts of a pointer.
// talk about parts of a pointer.
match
self
.memory
.check_bytes
(
dest
.ptr
,
size
,
/*allow_ptr*/
!
const_mode
)
{
// We also accept undef, for consistency with the type-based checks.
match
self
.memory
.check_bytes
(
dest
.ptr
,
size
,
/*allow_ptr_and_undef*/
!
const_mode
,
)
{
// In the happy case, we needn't check anything else.
// In the happy case, we needn't check anything else.
Ok
(())
=>
{},
Ok
(())
=>
{},
// Some error happened, try to provide a more detailed description.
// Some error happened, try to provide a more detailed description.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录