OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix overflow on bounds checks

Browse Source 
Closes #9020
This commit is contained in:
Daniel Micay 2013-10-14 23:25:33 -04:00
parent 420b4260b4
commit aa93381e14
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librustc/middle/trans/expr.rs
View File

@ -972,8 +972,6 @@ fn trans_lvalue_unadjusted(bcx: @mut Block, expr: &ast::Expr) -> DatumBlock {
let vt = tvec::vec_types(bcx, base_datum.ty);
base::maybe_name_value(bcx.ccx(), vt.llunit_size, "unit_sz");
let scaled_ix = Mul(bcx, ix_val, vt.llunit_size);
base::maybe_name_value(bcx.ccx(), scaled_ix, "scaled_ix");
let (bcx, base, len) =
base_datum.get_vec_base_and_len(bcx, index_expr.span,
@ -982,9 +980,9 @@ fn trans_lvalue_unadjusted(bcx: @mut Block, expr: &ast::Expr) -> DatumBlock {
debug2!("trans_index: base {}", bcx.val_to_str(base));
debug2!("trans_index: len {}", bcx.val_to_str(len));
let bounds_check = ICmp(bcx, lib::llvm::IntUGE, scaled_ix, len);
let bcx = do with_cond(bcx, bounds_check) |bcx| {
let unscaled_len = UDiv(bcx, len, vt.llunit_size);
let bounds_check = ICmp(bcx, lib::llvm::IntUGE, ix_val, unscaled_len);
let bcx = do with_cond(bcx, bounds_check) |bcx| {
controlflow::trans_fail_bounds_check(bcx, index_expr.span,
ix_val, unscaled_len)
};

19
src/test/run-fail/bounds-check-no-overflow.rs Normal file
View File

@ -0,0 +1,19 @@
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// error-pattern:index out of bounds: the len is 3 but the index is
use std::uint::max_value;
use std::sys::size_of;
fn main() {
let xs = [1, 2, 3];
xs[max_value / size_of::<int>() + 1];
}