Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
c3d392f5
R
Rust
项目概览
int
/
Rust
接近 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
c3d392f5
编写于
8月 19, 2018
作者:
R
Ralf Jung
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix validating fat raw pointers
上级
49999e9b
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
25 addition
and
18 deletion
+25
-18
src/librustc_mir/interpret/validity.rs
src/librustc_mir/interpret/validity.rs
+25
-18
未找到文件。
src/librustc_mir/interpret/validity.rs
浏览文件 @
c3d392f5
...
...
@@ -226,6 +226,7 @@ pub fn validate_mplace(
// Validate all fields
match
dest
.layout.fields
{
// primitives are unions with zero fields
// FIXME: Use some other indicator instead, like `layout.abi`.
layout
::
FieldPlacement
::
Union
(
0
)
=>
{
match
dest
.layout.abi
{
// nothing to do, whatever the pointer points to, it is never going to be read
...
...
@@ -277,33 +278,38 @@ pub fn validate_mplace(
}
},
layout
::
FieldPlacement
::
Arbitrary
{
ref
offsets
,
..
}
=>
{
//
fat pointers need special treatment
match
dest
.layout.ty
.builtin_deref
(
fals
e
)
.map
(|
tam
|
&
tam
.ty.sty
)
{
//
Fat pointers need special treatment.
match
dest
.layout.ty
.builtin_deref
(
tru
e
)
.map
(|
tam
|
&
tam
.ty.sty
)
{
|
Some
(
ty
::
TyStr
)
|
Some
(
ty
::
TySlice
(
_
))
=>
{
// check the length (for nicer error messages)
// check the length (for nicer error messages); must be valid even
// for a raw pointer.
let
len_mplace
=
self
.mplace_field
(
dest
,
1
)
?
;
let
len
=
self
.read_scalar
(
len_mplace
.into
())
?
;
let
len
=
match
len
.to_bits
(
len_mplace
.layout.size
)
{
Err
(
_
)
=>
return
validation_failure!
(
"length is not a valid integer"
,
path
),
Ok
(
len
)
=>
len
as
u64
,
};
// get the fat ptr, and recursively check it
// for safe ptrs, get the fat ptr, and recursively check it
if
!
dest
.layout.ty
.is_unsafe_ptr
()
{
let
ptr
=
self
.ref_to_mplace
(
self
.read_value
(
dest
.into
())
?
)
?
;
assert_eq!
(
ptr
.extra
,
PlaceExtra
::
Length
(
len
));
let
unpacked_ptr
=
self
.unpack_unsized_mplace
(
ptr
)
?
;
if
seen
.insert
(
unpacked_ptr
)
{
todo
.push
((
unpacked_ptr
,
path_clone_and_deref
(
path
)));
}
}
},
Some
(
ty
::
TyDynamic
(
..
))
=>
{
// check the vtable (for nicer error messages)
// check the vtable (for nicer error messages); must be valid even for a
// raw ptr.
let
vtable
=
self
.read_scalar
(
self
.mplace_field
(
dest
,
1
)
?
.into
())
?
;
let
vtable
=
match
vtable
.to_ptr
()
{
Err
(
_
)
=>
return
validation_failure!
(
"vtable address is not a pointer"
,
path
),
Ok
(
vtable
)
=>
vtable
,
};
// get the fat ptr, and recursively check it
// for safe ptrs, get the fat ptr, and recursively check it
if
!
dest
.layout.ty
.is_unsafe_ptr
()
{
let
ptr
=
self
.ref_to_mplace
(
self
.read_value
(
dest
.into
())
?
)
?
;
assert_eq!
(
ptr
.extra
,
PlaceExtra
::
Vtable
(
vtable
));
let
unpacked_ptr
=
self
.unpack_unsized_mplace
(
ptr
)
?
;
...
...
@@ -312,6 +318,7 @@ pub fn validate_mplace(
}
// FIXME: More checks for the vtable... making sure it is exactly
// the one one would expect for this type.
}
},
Some
(
ty
)
=>
bug!
(
"Unexpected fat pointer target type {:?}"
,
ty
),
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录