summaryrefslogtreecommitdiff
path: root/Lib/sre_parse.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-02-16 16:47:47 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2013-02-16 16:47:47 +0200
commit70ca0210e8958d2665541ddd38fce2965075674e (patch)
treef24e31538d932eebe73bdb07079096cabeb0e50a /Lib/sre_parse.py
parentb19ed57d8d75b1183193558a9880db44b95157b3 (diff)
downloadcpython-git-70ca0210e8958d2665541ddd38fce2965075674e.tar.gz
Issue #13169: The maximal repetition number in a regular expression has been
increased from 65534 to 2147483647 (on 32-bit platform) or 4294967294 (on 64-bit).
Diffstat (limited to 'Lib/sre_parse.py')
-rw-r--r--Lib/sre_parse.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index 19dd4fc4bc..045a5ebfef 100644
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -15,6 +15,7 @@
import sys
from sre_constants import *
+from _sre import MAXREPEAT
SPECIAL_CHARS = ".\\[{()*+?^$|"
REPEAT_CHARS = "*+?{"
@@ -505,10 +506,14 @@ def _parse(source, state):
continue
if lo:
min = int(lo)
+ if min >= MAXREPEAT:
+ raise OverflowError("the repetition number is too large")
if hi:
max = int(hi)
- if max < min:
- raise error("bad repeat interval")
+ if max >= MAXREPEAT:
+ raise OverflowError("the repetition number is too large")
+ if max < min:
+ raise error("bad repeat interval")
else:
raise error("not supported")
# figure out which item to repeat