X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=lib%2Fregcomp.c;h=6b7c1050fc116b8ebb1b95e3a53fa175e6a3be82;hb=c35b28d627d4804963e084bdd051993064cb25d7;hp=f0b2e522169fdc715cc3c876a7005fa4f847cc0b;hpb=875a98baebfca49e1ecdad28562ccaa2e57e9b3a;p=platform%2Fupstream%2Fm4.git

diff --git a/lib/regcomp.c b/lib/regcomp.c
index f0b2e52..6b7c105 100644
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -2187,6 +2187,7 @@ parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
 {
   re_dfa_t *dfa = preg->buffer;
   bin_tree_t *tree, *branch = NULL;
+  bitset_word_t initial_bkref_map = dfa->completed_bkref_map;
   tree = parse_branch (regexp, preg, token, syntax, nest, err);
   if (BE (*err != REG_NOERROR && tree == NULL, 0))
     return NULL;
@@ -2197,9 +2198,16 @@ parse_reg_exp (re_string_t *regexp, regex_t *preg, re_token_t *token,
       if (token->type != OP_ALT && token->type != END_OF_RE
 	  && (nest == 0 || token->type != OP_CLOSE_SUBEXP))
 	{
+      bitset_word_t accumulated_bkref_map = dfa->completed_bkref_map;
+      dfa->completed_bkref_map = initial_bkref_map;
 	  branch = parse_branch (regexp, preg, token, syntax, nest, err);
 	  if (BE (*err != REG_NOERROR && branch == NULL, 0))
+	  {
+	    if (tree != NULL)
+		  postorder (tree, free_tree, NULL);
 	    return NULL;
+	  }
+	  dfa->completed_bkref_map |= accumulated_bkref_map;
 	}
       else
 	branch = NULL;