Skip to content

Commit 0c2ceb1

Browse files
committed
libsyntax: fail lexing with an error message on an int literal larger than 2^64.
Stops an ICE. Closes #5544.
1 parent 41c6f67 commit 0c2ceb1

File tree

3 files changed

+37
-2
lines changed

3 files changed

+37
-2
lines changed

src/libsyntax/parse/lexer.rs

+9-2
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,11 @@ fn scan_number(c: char, rdr: @mut StringReader) -> token::Token {
442442
if str::len(num_str) == 0u {
443443
rdr.fatal(~"no valid digits found for number");
444444
}
445-
let parsed = u64::from_str_radix(num_str, base as uint).get();
445+
let parsed = match u64::from_str_radix(num_str, base as uint) {
446+
Some(p) => p,
447+
None => rdr.fatal(~"int literal is too large")
448+
};
449+
446450
match tp {
447451
either::Left(t) => return token::LIT_INT(parsed as i64, t),
448452
either::Right(t) => return token::LIT_UINT(parsed, t)
@@ -503,7 +507,10 @@ fn scan_number(c: char, rdr: @mut StringReader) -> token::Token {
503507
if str::len(num_str) == 0u {
504508
rdr.fatal(~"no valid digits found for number");
505509
}
506-
let parsed = u64::from_str_radix(num_str, base as uint).get();
510+
let parsed = match u64::from_str_radix(num_str, base as uint) {
511+
Some(p) => p,
512+
None => rdr.fatal(~"int literal is too large")
513+
};
507514

508515
debug!("lexing %s as an unsuffixed integer literal",
509516
num_str);

src/test/compile-fail/issue-5544-a.rs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
fn main() {
12+
let _i = 18446744073709551616; // 2^64
13+
//~^ ERROR int literal is too large
14+
}

src/test/compile-fail/issue-5544-b.rs

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
fn main() {
12+
let _i = 0xff_ffff_ffff_ffff_ffff;
13+
//~^ ERROR int literal is too large
14+
}

0 commit comments

Comments
 (0)