about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-11-13 09:54:39 +0000
committerUlrich Drepper <drepper@redhat.com>2003-11-13 09:54:39 +0000
commitc34bfc8d37680f001ee1baa95ab9e0323adc5819 (patch)
treefed7021775649396e0d24ff728d13ba1296d76c3
parentf6953f16bb49383a162560662778a377e4501039 (diff)
downloadglibc-c34bfc8d37680f001ee1baa95ab9e0323adc5819.tar.gz
glibc-c34bfc8d37680f001ee1baa95ab9e0323adc5819.tar.xz
glibc-c34bfc8d37680f001ee1baa95ab9e0323adc5819.zip
Update.
2003-11-13  Ulrich Drepper  <drepper@redhat.com>

	* posix/regcomp.c (parse_expression): In BRE consecutive
	duplications are not allowed.
-rw-r--r--ChangeLog5
-rw-r--r--posix/regcomp.c8
2 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cc7df9921..8661ab0368 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-13  Ulrich Drepper  <drepper@redhat.com>
+
+	* posix/regcomp.c (parse_expression): In BRE consecutive
+	duplications are not allowed.
+
 2003-11-12  Ulrich Drepper  <drepper@redhat.com>
 
 	* posix/regcomp.c (parse_bracket_exp): If end of expression is
diff --git a/posix/regcomp.c b/posix/regcomp.c
index 531ec94f75..9a48aa3f3b 100644
--- a/posix/regcomp.c
+++ b/posix/regcomp.c
@@ -2233,6 +2233,14 @@ parse_expression (regexp, preg, token, syntax, nest, err)
       tree = parse_dup_op (tree, regexp, dfa, token, syntax, err);
       if (BE (*err != REG_NOERROR && tree == NULL, 0))
 	return NULL;
+      /* In BRE consecutive duplications are not allowed.  */
+      if ((syntax & RE_CONTEXT_INVALID_DUP)
+	  && (token->type == OP_DUP_ASTERISK
+	      || token->type == OP_OPEN_DUP_NUM))
+	{
+	  *err = REG_BADRPT;
+	  return NULL;
+	}
       dfa->has_plural_match = 1;
     }