From bc7a85de295c909dcefd4eb7392a9aff2129ab05 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 21 Aug 2014 15:47:37 -0700 Subject: syntax: Fix complexity of string parsing. Closes #16624. --- src/libsyntax/parse/mod.rs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index e76e4adcd7f..17a27a5a39e 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -412,14 +412,21 @@ pub fn str_lit(lit: &str) -> String { loop { match chars.next() { Some((i, c)) => { - let em = error(i); match c { '\\' => { - if chars.peek().expect(em.as_slice()).val1() == '\n' { + let ch = chars.peek().unwrap_or_else(|| { + fail!("{}", error(i).as_slice()) + }).val1(); + + if ch == '\n' { eat(&mut chars); - } else if chars.peek().expect(em.as_slice()).val1() == '\r' { + } else if ch == '\r' { chars.next(); - if chars.peek().expect(em.as_slice()).val1() != '\n' { + let ch = chars.peek().unwrap_or_else(|| { + fail!("{}", error(i).as_slice()) + }).val1(); + + if ch != '\n' { fail!("lexer accepted bare CR"); } eat(&mut chars); @@ -433,7 +440,11 @@ pub fn str_lit(lit: &str) -> String { } }, '\r' => { - if chars.peek().expect(em.as_slice()).val1() != '\n' { + let ch = chars.peek().unwrap_or_else(|| { + fail!("{}", error(i).as_slice()) + }).val1(); + + if ch != '\n' { fail!("lexer accepted bare CR"); } chars.next(); -- cgit 1.4.1-3-g733a5