[Python-checkins] cpython (3.3): Issue #18647: Correctly bound calculated min/max width of a subexpression.

[serhiy.storchaka]

http://hg.python.org/cpython/rev/de049e9abdf7
changeset:   85268:de049e9abdf7
branch:      3.3
parent:      85263:f967ded6f9dd
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Mon Aug 19 22:50:54 2013 +0300
summary:
  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.

files:
  Lib/sre_parse.py |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -148,7 +148,7 @@
         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 @@
                 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:

-- 
Repository URL: http://hg.python.org/cpython