From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 19 Aug 2013 19:50:54 +0000 (+0300)
Subject: Issue #18647: Correctly bound calculated min/max width of a subexpression.
X-Git-Tag: v3.4.0a2~179^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d96542b6d1f5c470a60f21d0d8b4ee3edcb17f9;p=thirdparty%2FPython%2Fcpython.git

Issue #18647: Correctly bound calculated min/max width of a subexpression.

Now max width is MAXREPEAT on 32- and 64-bit platforms when one of
subexpressions is unbounded repetition.
---

diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index 9e0501f70a1f..f26229fc2870 100644
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -148,7 +148,7 @@ class SubPattern:
         REPEATCODES = (MIN_REPEAT, MAX_REPEAT)
         for op, av in self.data:
             if op is BRANCH:
-                i = sys.maxsize
+                i = MAXREPEAT - 1
                 j = 0
                 for av in av[1]:
                     l, h = av.getwidth()
@@ -166,14 +166,14 @@ class SubPattern:
                 hi = hi + j
             elif op in REPEATCODES:
                 i, j = av[2].getwidth()
-                lo = lo + int(i) * av[0]
-                hi = hi + int(j) * av[1]
+                lo = lo + i * av[0]
+                hi = hi + j * av[1]
             elif op in UNITCODES:
                 lo = lo + 1
                 hi = hi + 1
             elif op == SUCCESS:
                 break
-        self.width = int(min(lo, sys.maxsize)), int(min(hi, sys.maxsize))
+        self.width = min(lo, MAXREPEAT - 1), min(hi, MAXREPEAT)
         return self.width
 
 class Tokenizer: