about summary refs log tree commit diff
path: root/src/libregex/parse.rs
diff options
context:
space:
mode:
authorBarosl Lee <vcs@barosl.com>2014-12-26 13:46:39 +0900
committerBarosl Lee <vcs@barosl.com>2014-12-26 14:02:51 +0900
commit0bd8534ca7ac8e4379d82b39804d447c16704558 (patch)
treed5bbc4f5154d162a24e625d215a91cdf275e75e1 /src/libregex/parse.rs
parent5ba6102657a892457063d2d6a7cbb9632ce282c6 (diff)
downloadrust-0bd8534ca7ac8e4379d82b39804d447c16704558.tar.gz
rust-0bd8534ca7ac8e4379d82b39804d447c16704558.zip
Prevent Regex::new() from panicking when a non-AST item is repeated
This bug has also affected the regex! macro, which has caused an ICE
when such an invalid expression is provided.

Fixes #20208.
Diffstat (limited to 'src/libregex/parse.rs')
-rw-r--r--src/libregex/parse.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libregex/parse.rs b/src/libregex/parse.rs
index 0cd8df73c37..105687b89fd 100644
--- a/src/libregex/parse.rs
+++ b/src/libregex/parse.rs
@@ -320,9 +320,10 @@ impl<'a> Parser<'a> {
     }
 
     fn push_repeater(&mut self, c: char) -> Result<(), Error> {
-        if self.stack.len() == 0 {
-            return self.err(
-                "A repeat operator must be preceded by a valid expression.")
+        match self.stack.last() {
+            Some(&Expr(..)) => (),
+            // self.stack is empty, or the top item is not an Expr
+            _ => return self.err("A repeat operator must be preceded by a valid expression."),
         }
         let rep: Repeater = match c {
             '?' => ZeroOne, '*' => ZeroMore, '+' => OneMore,