Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gh-104016: Fixed off by 1 error in f string tokenizer #104047

Merged
merged 9 commits into from
May 1, 2023
Merged

gh-104016: Fixed off by 1 error in f string tokenizer #104047

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9d72066
Fixed off by 1 error in f string tokenizer
jx124 May 1, 2023
ab38fd2
📜🤖 Added by blurb_it.
blurb-it[bot] May 1, 2023
eb4b729
Update test_fstring.py
jx124 May 1, 2023
d5f4a3d
Fixed tabs and assert
jx124 May 1, 2023
ef0a1c2
Merge branch 'fix-issue-104016' of https://github.com/jx124/cpython i…
jx124 May 1, 2023
d07ddb4
Undo accidental reformat
jx124 May 1, 2023
2c48eae
Removed whitespace.
jx124 May 1, 2023
de9a495
Use two separate limits and update tests
pablogsal May 1, 2023
d3a2fca
delete news entry
pablogsal May 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/test/test_fstring.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,6 +1548,10 @@ def test_syntax_error_after_debug(self):
"f'{1=}{1;'",
"f'{1=}{1;}'",
])

def test_nested_fstring_max_stack_level(self):
with self.assertRaises(SyntaxError):
compile('f"{1 1:' + ('{f"1:' * 199), "?", "exec")
jx124 marked this conversation as resolved.
Show resolved Hide resolved

if __name__ == '__main__':
unittest.main()
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-05-01-16-35-02.gh-issue-104016.CjjY_3.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed off-by-1 error in f-string tokenizer.
4 changes: 2 additions & 2 deletions Parser/tokenizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static inline tokenizer_mode* TOK_GET_MODE(struct tok_state* tok) {
}
static inline tokenizer_mode* TOK_NEXT_MODE(struct tok_state* tok) {
assert(tok->tok_mode_stack_index >= 0);
assert(tok->tok_mode_stack_index < MAXLEVEL);
assert(tok->tok_mode_stack_index + 1 < MAXLEVEL);
return &(tok->tok_mode_stack[++tok->tok_mode_stack_index]);
}
#else
Expand Down Expand Up @@ -2413,7 +2413,7 @@ tok_get_normal_mode(struct tok_state *tok, tokenizer_mode* current_tok, struct t
case '(':
case '[':
case '{':
if (tok->level >= MAXLEVEL) {
if (tok->level >= MAXLEVEL || tok->tok_mode_stack_index + 1 >= MAXLEVEL) {
return MAKE_TOKEN(syntaxerror(tok, "too many nested parentheses"));
}
tok->parenstack[tok->level] = c;
Expand Down