mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

syntax: Prevent bumping the parser EOF to stop infinite loops.

Browse Source
This commit is contained in:
Eduard Burtescu 2016-03-26 00:13:54 +02:00
parent 8f34053f76
commit 6abab49029
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsyntax/parse/parser.rs
View File

@ -254,6 +254,7 @@ pub struct Parser<'a> {
/// the previous token or None (only stashed sometimes).
pub last_token: Option<Box<token::Token>>,
last_token_interpolated: bool,
last_token_eof: bool,
pub buffer: [TokenAndSpan; 4],
pub buffer_start: isize,
pub buffer_end: isize,
@ -366,6 +367,7 @@ impl<'a> Parser<'a> {
last_span: span,
last_token: None,
last_token_interpolated: false,
last_token_eof: false,
buffer: [
placeholder.clone(),
placeholder.clone(),
@ -998,6 +1000,15 @@ impl<'a> Parser<'a> {
/// Advance the parser by one token
pub fn bump(&mut self) {
if self.last_token_eof {
// Bumping after EOF is a bad sign, usually an infinite loop.
self.bug("attempted to bump the parser past EOF (may be stuck in a loop)");
}
if self.token == token::Eof {
self.last_token_eof = true;
}
self.last_span = self.span;
// Stash token for error recovery (sometimes; clone is not necessarily cheap).
self.last_token = if self.token.is_ident() ||