diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-09-23 20:22:41 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-09-23 20:22:41 (GMT) |
| commit | c563caf3a21115fa1e2eb6c7b455ec58ca85e8e4 (patch) | |
| tree | d7012d5ee034fcfc25576c30e87a6260a44ea6e9 /Lib/sre_parse.py | |
| parent | d8644db4e771f89e5f624ae90d63b81c83d51838 (diff) | |
| download | cpython-c563caf3a21115fa1e2eb6c7b455ec58ca85e8e4.zip cpython-c563caf3a21115fa1e2eb6c7b455ec58ca85e8e4.tar.gz cpython-c563caf3a21115fa1e2eb6c7b455ec58ca85e8e4.tar.bz2 | |
Issue #22362: Forbidden ambiguous octal escapes out of range 0-0o377 in
regular expressions.
Diffstat (limited to 'Lib/sre_parse.py')
| -rw-r--r-- | Lib/sre_parse.py | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py index b56d437..7fd145b 100644 --- a/Lib/sre_parse.py +++ b/Lib/sre_parse.py @@ -295,7 +295,11 @@ def _class_escape(source, escape): elif c in OCTDIGITS: # octal escape (up to three digits) escape += source.getwhile(2, OCTDIGITS) - return LITERAL, int(escape[1:], 8) & 0xff + c = int(escape[1:], 8) + if c > 0o377: + raise error('octal escape value %r outside of ' + 'range 0-0o377' % escape) + return LITERAL, c elif c in DIGITS: raise ValueError if len(escape) == 2: @@ -337,7 +341,7 @@ def _escape(source, escape, state): elif c == "0": # octal escape escape += source.getwhile(2, OCTDIGITS) - return LITERAL, int(escape[1:], 8) & 0xff + return LITERAL, int(escape[1:], 8) elif c in DIGITS: # octal escape *or* decimal group reference (sigh) if source.next in DIGITS: @@ -346,7 +350,11 @@ def _escape(source, escape, state): source.next in OCTDIGITS): # got three octal digits; this is an octal escape escape = escape + source.get() - return LITERAL, int(escape[1:], 8) & 0xff + c = int(escape[1:], 8) + if c > 0o377: + raise error('octal escape value %r outside of ' + 'range 0-0o377' % escape) + return LITERAL, c # not an octal escape, so this is a group reference group = int(escape[1:]) if group < state.groups: @@ -837,7 +845,11 @@ def parse_template(source, pattern): s.next in OCTDIGITS): this += sget() isoctal = True - lappend(chr(int(this[1:], 8) & 0xff)) + c = int(this[1:], 8) + if c > 0o377: + raise error('octal escape value %r outside of ' + 'range 0-0o377' % this) + lappend(chr(c)) if not isoctal: addgroup(int(this[1:])) else: |