# HG changeset patch

# User Serhiy Storchaka <storchaka@gmail.com>

# Date 1369166013 -10800

# Node ID 8408eed151ebee1c546414f1f40be46c1ad76077

# Parent  7fce9186accb10122e45d975f4b380c2ed0fae35

Issue #17979: Fixed the re module in build with --disable-unicode.

diff --git a/Modules/sre.h b/Modules/sre.h

--- a/Modules/sre.h

+++ b/Modules/sre.h

@@ -23,8 +23,8 @@

 #  define SRE_MAXREPEAT ((SRE_CODE)PY_SSIZE_T_MAX + 1u)

 # endif

 #else

-# define SRE_CODE unsigned long

-# if SIZEOF_SIZE_T > SIZEOF_LONG

+# define SRE_CODE unsigned int

+# if SIZEOF_SIZE_T > SIZEOF_INT

 #  define SRE_MAXREPEAT (~(SRE_CODE)0)

 # else

 #  define SRE_MAXREPEAT ((SRE_CODE)PY_SSIZE_T_MAX + 1u)

# HG changeset patch

# User Serhiy Storchaka <storchaka@gmail.com>

# Date 1375547193 -10800

# Node ID e5e425fd1e4f7e859abdced43621203cdfa87a16

# Parent  8205e72b5cfcdb7a3450c80f3368eff610bc650c

Issue #17998: Fix an internal error in regular expression engine.

diff --git a/Lib/test/test_re.py b/Lib/test/test_re.py

--- a/Lib/test/test_re.py

+++ b/Lib/test/test_re.py

@@ -907,6 +907,16 @@ class ReTests(unittest.TestCase):

                 self.assertEqual(m.group(1), "")

                 self.assertEqual(m.group(2), "y")

+    def test_issue17998(self):

+        for reps in '*', '+', '?', '{1}':

+            for mod in '', '?':

+                pattern = '.' + reps + mod + 'yz'

+                self.assertEqual(re.compile(pattern, re.S).findall('xyz'),

+                                 ['xyz'], msg=pattern)

+                pattern = pattern.encode()

+                self.assertEqual(re.compile(pattern, re.S).findall(b'xyz'),

+                                 [b'xyz'], msg=pattern)

+

 def run_re_tests():

diff --git a/Modules/_sre.c b/Modules/_sre.c

--- a/Modules/_sre.c

+++ b/Modules/_sre.c

@@ -1028,7 +1028,7 @@ entrance:

             TRACE(("|%p|%p|REPEAT_ONE %d %d\n", ctx->pattern, ctx->ptr,

                    ctx->pattern[1], ctx->pattern[2]));

-            if (ctx->pattern[1] > end - ctx->ptr)

+            if ((Py_ssize_t) ctx->pattern[1] > end - ctx->ptr)

                 RETURN_FAILURE; /* cannot match */

             state->ptr = ctx->ptr;

@@ -1111,7 +1111,7 @@ entrance:

             TRACE(("|%p|%p|MIN_REPEAT_ONE %d %d\n", ctx->pattern, ctx->ptr,

                    ctx->pattern[1], ctx->pattern[2]));

-            if (ctx->pattern[1] > end - ctx->ptr)

+            if ((Py_ssize_t) ctx->pattern[1] > end - ctx->ptr)

                 RETURN_FAILURE; /* cannot match */

             state->ptr = ctx->ptr;

@@ -1210,7 +1210,7 @@ entrance:

             TRACE(("|%p|%p|MAX_UNTIL %d\n", ctx->pattern,

                    ctx->ptr, ctx->count));

-            if (ctx->count < ctx->u.rep->pattern[1]) {

+            if (ctx->count < (Py_ssize_t) ctx->u.rep->pattern[1]) {

                 /* not enough matches */

                 ctx->u.rep->count = ctx->count;

                 DO_JUMP(JUMP_MAX_UNTIL_1, jump_max_until_1,

@@ -1224,7 +1224,7 @@ entrance:

                 RETURN_FAILURE;

             }

-            if ((ctx->count < ctx->u.rep->pattern[2] ||

+            if ((ctx->count < (Py_ssize_t) ctx->u.rep->pattern[2] ||

                 ctx->u.rep->pattern[2] == SRE_MAXREPEAT) &&

                 state->ptr != ctx->u.rep->last_ptr) {

                 /* we may have enough matches, but if we can

@@ -1273,7 +1273,7 @@ entrance:

             TRACE(("|%p|%p|MIN_UNTIL %d %p\n", ctx->pattern,

                    ctx->ptr, ctx->count, ctx->u.rep->pattern));

-            if (ctx->count < ctx->u.rep->pattern[1]) {

+            if (ctx->count < (Py_ssize_t) ctx->u.rep->pattern[1]) {

                 /* not enough matches */

                 ctx->u.rep->count = ctx->count;

                 DO_JUMP(JUMP_MIN_UNTIL_1, jump_min_until_1,

@@ -1302,7 +1302,7 @@ entrance:

             LASTMARK_RESTORE();

-            if ((ctx->count >= ctx->u.rep->pattern[2]

+            if ((ctx->count >= (Py_ssize_t) ctx->u.rep->pattern[2]

                 && ctx->u.rep->pattern[2] != SRE_MAXREPEAT) ||

                 state->ptr == ctx->u.rep->last_ptr)

                 RETURN_FAILURE;

diff --git a/Modules/sre.h b/Modules/sre.h

--- a/Modules/sre.h

+++ b/Modules/sre.h

@@ -20,14 +20,14 @@

 # if SIZEOF_SIZE_T > 4

 #  define SRE_MAXREPEAT (~(SRE_CODE)0)

 # else

-#  define SRE_MAXREPEAT ((SRE_CODE)PY_SSIZE_T_MAX + 1u)

+#  define SRE_MAXREPEAT ((SRE_CODE)PY_SSIZE_T_MAX)

 # endif

 #else

 # define SRE_CODE unsigned int

 # if SIZEOF_SIZE_T > SIZEOF_INT

 #  define SRE_MAXREPEAT (~(SRE_CODE)0)

 # else

-#  define SRE_MAXREPEAT ((SRE_CODE)PY_SSIZE_T_MAX + 1u)

+#  define SRE_MAXREPEAT ((SRE_CODE)PY_SSIZE_T_MAX)

 # endif

 #endif