summaryrefslogtreecommitdiff
path: root/Lib/sre_parse.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-08-19 22:50:54 +0300
committerSerhiy Storchaka <storchaka@gmail.com>2013-08-19 22:50:54 +0300
commit5893410e37794e07a575c486ca803796475dce43 (patch)
treeae157900ac8044431a66ae591e8759134de94ff2 /Lib/sre_parse.py
parent09c340a1b86bd0b26612ed6420a4ea566b3b9915 (diff)
downloadcpython-5893410e37794e07a575c486ca803796475dce43.tar.gz
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.
Diffstat (limited to 'Lib/sre_parse.py')
-rw-r--r--Lib/sre_parse.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index 9e0501f70a..f26229fc28 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: