From: K.Kosako <kosako@sofnec.co.jp>
Date: Tue, 25 Jul 2017 04:16:59 +0000 (+0900)
Subject: --enable-combination-explosion-check is broken in 6.4.0
X-Git-Tag: v6.5.0^2~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c034fb8e46bbfd95f22f8ea7298917a6796dc37f;p=onig

--enable-combination-explosion-check is broken in 6.4.0
---

diff --git a/src/regcomp.c b/src/regcomp.c
index 459a7c3..e305c79 100644
--- a/src/regcomp.c
+++ b/src/regcomp.c
@@ -4015,10 +4015,8 @@ setup_comb_exp_check(Node* node, int state, ScanEnv* env)
   switch (NODE_TYPE(node)) {
   case NODE_LIST:
     {
-      Node* prev = NULL_NODE;
       do {
         r = setup_comb_exp_check(NODE_CAR(node), r, env);
-        prev = NODE_CAR(node);
       } while (r >= 0 && IS_NOT_NULL(node = NODE_CDR(node)));
     }
     break;
@@ -4105,8 +4103,8 @@ setup_comb_exp_check(Node* node, int state, ScanEnv* env)
       switch (en->type) {
       case ENCLOSURE_MEMORY:
         {
-          if (env->curr_max_regnum < en->regnum)
-            env->curr_max_regnum = en->regnum;
+          if (env->curr_max_regnum < en->m.regnum)
+            env->curr_max_regnum = en->m.regnum;
 
           r = setup_comb_exp_check(NODE_ENCLOSURE_BODY(en), state, env);
         }