Skip to content

Commit

Permalink
[3.10] bpo-46707: Avoid potential exponential backtracking in some sy…
Browse files Browse the repository at this point in the history
…ntax errors (GH-31241). (GH-31242)

(cherry picked from commit b71dc71)

Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
  • Loading branch information
pablogsal committed Feb 10, 2022
1 parent 7445949 commit 9b23f8f
Show file tree
Hide file tree
Showing 4 changed files with 901 additions and 884 deletions.
4 changes: 3 additions & 1 deletion Grammar/python.gram
Expand Up @@ -863,13 +863,15 @@ invalid_expression:
RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Perhaps you forgot a comma?") }
| a=disjunction 'if' b=disjunction !('else'|':') { RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "expected 'else' after 'if' expression") }

invalid_left_assignment_prefixes(memo): list|tuple|genexp|'True'|'None'|'False'

invalid_named_expression:
| a=expression ':=' expression {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(
a, "cannot use assignment expressions with %s", _PyPegen_get_expr_name(a)) }
| a=NAME '=' b=bitwise_or !('='|':=') {
p->in_raw_rule ? NULL : RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "invalid syntax. Maybe you meant '==' or ':=' instead of '='?") }
| !(list|tuple|genexp|'True'|'None'|'False') a=bitwise_or b='=' bitwise_or !('='|':=') {
| !invalid_left_assignment_prefixes a=bitwise_or b='=' bitwise_or !('='|':=') {
p->in_raw_rule ? NULL : RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "cannot assign to %s here. Maybe you meant '==' instead of '='?",
_PyPegen_get_expr_name(a)) }

Expand Down
8 changes: 8 additions & 0 deletions Lib/test/test_syntax.py
Expand Up @@ -1617,6 +1617,14 @@ def test_error_on_parser_stack_overflow(self):
with self.assertRaises(MemoryError):
compile(source, "<string>", mode)

@support.cpython_only
def test_deep_invalid_rule(self):
# Check that a very deep invalid rule in the PEG
# parser doesn't have exponential backtracking.
source = "d{{{{{{{{{{{{{{{{{{{{{{{{{```{{{{{{{ef f():y"
with self.assertRaises(SyntaxError):
compile(source, "<string>", "exec")


def test_main():
support.run_unittest(SyntaxTestCase)
Expand Down
@@ -0,0 +1,2 @@
Avoid potential exponential backtracking when producing some syntax errors
involving lots of brackets. Patch by Pablo Galindo.

0 comments on commit 9b23f8f

Please sign in to comment.