From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 7 May 2012 21:43:38 +0000 (-0400)
Subject: fix regex breakage in last commit (failure to handle empty regex, etc.)
X-Git-Tag: v0.9.1~73
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a5a47783359dff3e583693bcddc1c5e3311d96ac;p=oweals%2Fmusl.git

fix regex breakage in last commit (failure to handle empty regex, etc.)
---

diff --git a/src/regex/regcomp.c b/src/regex/regcomp.c
index fa79e2e5..5f119d17 100644
--- a/src/regex/regcomp.c
+++ b/src/regex/regcomp.c
@@ -1149,10 +1149,6 @@ tre_parse(tre_parse_ctx_t *ctx)
 	     an empty set of `()', a bracket expression, `.', `^', `$',
 	     a `\' followed by a character, or a single character. */
 
-	  /* End of regexp? (empty string). */
-	  if (!*ctx->re)
-	    goto parse_literal;
-
 	  switch (*ctx->re)
 	    {
 	    case CHAR_LPAREN:  /* parenthesized subexpression */
@@ -1394,6 +1390,7 @@ tre_parse(tre_parse_ctx_t *ctx)
 	      if (!(ctx->cflags & REG_EXTENDED))
 	        goto parse_literal;
 
+	    case 0:
 	    empty_atom:
 	      result = tre_ast_new_literal(ctx->mem, EMPTY, -1, -1);
 	      if (!result)