about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-05-20 21:34:10 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-05-20 21:34:10 -0700
commit40d3241a4a929dc095dd94862e25e5684ef1083d (patch)
tree922ad0c5b6d5a620226519ee2ea2987e5630af23
parent1b2dd90f1b23e612f4ab499656d02d367594d45d (diff)
downloadrust-40d3241a4a929dc095dd94862e25e5684ef1083d.tar.gz
rust-40d3241a4a929dc095dd94862e25e5684ef1083d.zip
rustc: Avoid out of bounds in check_match
Closes #12116
-rw-r--r--src/librustc/middle/check_match.rs1
-rw-r--r--src/test/compile-fail/issue-12116.rs25
2 files changed, 26 insertions, 0 deletions
diff --git a/src/librustc/middle/check_match.rs b/src/librustc/middle/check_match.rs
index 1017f4cfe2f..67bdb949327 100644
--- a/src/librustc/middle/check_match.rs
+++ b/src/librustc/middle/check_match.rs
@@ -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() }
diff --git a/src/test/compile-fail/issue-12116.rs b/src/test/compile-fail/issue-12116.rs
new file mode 100644
index 00000000000..a80e405d05c
--- /dev/null
+++ b/src/test/compile-fail/issue-12116.rs
@@ -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() {}