Skip to content

Commit

Permalink
rustc: Avoid out of bounds in check_match
Browse files Browse the repository at this point in the history
Closes #12116
  • Loading branch information
alexcrichton committed May 21, 2014
1 parent 1b2dd90 commit 40d3241
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/librustc/middle/check_match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ fn is_useful(cx: &MatchCheckCtxt, m: &matrix, v: &[@Pat]) -> useful {
_ => *r.get(0)
}
}
None if v.len() == 0 => return not_useful,
None => v[0]
};
let left_ty = if real_pat.id == 0 { ty::mk_nil() }
Expand Down
25 changes: 25 additions & 0 deletions src/test/compile-fail/issue-12116.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
// Copyright 2012-2014 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.

enum IntList {
Cons(int, Box<IntList>),
Nil
}

fn tail(source_list: &IntList) -> IntList {
match source_list {
&Cons(val, box ref next_list) => tail(next_list),
&Cons(val, box Nil) => Cons(val, box Nil),
//~^ ERROR: unreachable pattern
_ => fail!()
}
}

fn main() {}

0 comments on commit 40d3241

Please sign in to comment.