user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix soundness hole when unsizing boxes.

Browse source
This commit is contained in:
Niko Matsakis 2015-03-16 16:26:28 -04:00
parent 5f5ed62298
commit 277b4f035a
3 changed files with 61 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/librustc/middle/expr_use_visitor.rs
View file

@ -857,28 +857,13 @@ impl<'d,'t,'tcx,TYPER:mc::Typer<'tcx>> ExprUseVisitor<'d,'t,'tcx,TYPER> {
n: uint) {
debug!("walk_autoref expr={}", expr.repr(self.tcx()));
// Match for unique trait coercions first, since we don't need the
// call to cat_expr_autoderefd.
match *autoref {
ty::AutoUnsizeUniq(ty::UnsizeVtable(..)) |
ty::AutoUnsize(ty::UnsizeVtable(..)) => {
assert!(n == 1, format!("Expected exactly 1 deref with Uniq \
AutoRefs, found: {}", n));
let cmt_unadjusted =
return_if_err!(self.mc.cat_expr_unadjusted(expr));
self.delegate_consume(expr.id, expr.span, cmt_unadjusted);
return;
}
_ => {}
}
let cmt_derefd = return_if_err!(
self.mc.cat_expr_autoderefd(expr, n));
debug!("walk_adjustment: cmt_derefd={}",
cmt_derefd.repr(self.tcx()));
match *autoref {
ty::AutoPtr(r, m, _) => {
let cmt_derefd = return_if_err!(
self.mc.cat_expr_autoderefd(expr, n));
debug!("walk_adjustment: cmt_derefd={}",
cmt_derefd.repr(self.tcx()));
self.delegate.borrow(expr.id,
expr.span,
cmt_derefd,
@ -886,7 +871,16 @@ impl<'d,'t,'tcx,TYPER:mc::Typer<'tcx>> ExprUseVisitor<'d,'t,'tcx,TYPER> {
ty::BorrowKind::from_mutbl(m),
AutoRef);
}
ty::AutoUnsizeUniq(_) | ty::AutoUnsize(_) | ty::AutoUnsafe(..) => {}
ty::AutoUnsize(_) |
ty::AutoUnsizeUniq(_) => {
assert!(n == 1, format!("Expected exactly 1 deref with Uniq \
AutoRefs, found: {}", n));
let cmt_unadjusted =
return_if_err!(self.mc.cat_expr_unadjusted(expr));
self.delegate_consume(expr.id, expr.span, cmt_unadjusted);
}
ty::AutoUnsafe(..) => {
}
}
}