auto merge of #20238 : barosl/rust/regex-repeater-panic, r=huonw

This bug has also affected the `regex!` macro, which has caused an ICE when such an invalid expression is provided.

Fixes #20208.

2 files changed, 5 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,
diff --git a/src/libregex/test/tests.rs b/src/libregex/test/tests.rs
index 2f66d483d80..d087814b7f4 100644
--- a/src/libregex/test/tests.rs
+++ b/src/libregex/test/tests.rs
@@ -142,6 +142,7 @@ noparse!{fail_range_end_no_class, "[a-[:lower:]]"}
 noparse!{fail_range_end_no_begin, r"[a-\A]"}
 noparse!{fail_range_end_no_end, r"[a-\z]"}
 noparse!{fail_range_end_no_boundary, r"[a-\b]"}
+noparse!{fail_repeat_no_expr, r"-|+"}
 
 macro_rules! mat {
     ($name:ident, $re:expr, $text:expr, $($loc:tt)+) => (