From: K.Kosako <kkosako0@gmail.com>
Date: Sat, 31 Mar 2018 07:45:03 +0000 (+0900)
Subject: invalid empty check in STACK_EMPTY_CHECK_MEMST_REC()
X-Git-Tag: v6.8.2^2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b2ccc4a907b6d9c3ed196010a3456e1a638d5c7;p=onig

invalid empty check in STACK_EMPTY_CHECK_MEMST_REC()
---

diff --git a/src/regexec.c b/src/regexec.c
index 694981d..bf118ce 100644
--- a/src/regexec.c
+++ b/src/regexec.c
@@ -1873,7 +1873,6 @@ stack_double(int is_alloca, char** arg_alloc_base,
                 endp = STACK_AT(k->u.mem.end)->u.mem.pstr;\
               else\
                 endp = (UChar* )k->u.mem.end;\
-              /*fprintf(stderr, "num: %d, pstr: %p, endp: %p\n", k->u.mem.num, STACK_AT(k->u.mem.start)->u.mem.pstr, endp);*/ \
               if (STACK_AT(k->u.mem.start)->u.mem.pstr != endp) {\
                 (isnull) = 0; break;\
               }\
@@ -1908,20 +1907,28 @@ stack_double(int is_alloca, char** arg_alloc_base,
             (isnull) = 1;\
             while (k < stk) {\
               if (k->type == STK_MEM_START) {\
-                if (k->u.mem.end == INVALID_STACK_INDEX) {\
-                  (isnull) = 0; break;\
-                }\
-                if (MEM_STATUS_AT(reg->bt_mem_end, k->zid))\
-                  endp = STACK_AT(k->u.mem.end)->u.mem.pstr;\
-                else\
-                  endp = (UChar* )k->u.mem.end;\
-                if (STACK_AT(k->u.mem.start)->u.mem.pstr != endp) {\
-                  (isnull) = 0; break;\
-                }\
-                else if (endp != s) {\
-                  (isnull) = -1; /* empty, but position changed */ \
+                if (level == 0) {\
+                  if (k->u.mem.end == INVALID_STACK_INDEX) {\
+                    (isnull) = 0; break;\
+                  }\
+                  if (MEM_STATUS_AT(reg->bt_mem_end, k->zid))\
+                    endp = STACK_AT(k->u.mem.end)->u.mem.pstr;\
+                  else\
+                    endp = (UChar* )k->u.mem.end;\
+                  if (STACK_AT(k->u.mem.start)->u.mem.pstr != endp) {\
+                    (isnull) = 0; break;\
+                  }\
+                  else if (endp != s) {\
+                    (isnull) = -1; /* empty, but position changed */\
+                  }\
                 }\
               }\
+              else if (k->type == STK_EMPTY_CHECK_START) {\
+                if (k->zid == (sid)) level++;\
+              }\
+              else if (k->type == STK_EMPTY_CHECK_END) {\
+                if (k->zid == (sid)) level--;\
+              }\
               k++;\
             }\
             break;\