Skip to content

[3.11] gh-99891: Fix infinite recursion in the tokenizer when showing warnings (GH-99893) #99896

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

Merged
miss-islington merged 2 commits into from
Dec 1, 2022
Merged

[3.11] gh-99891: Fix infinite recursion in the tokenizer when showing warnings (GH-99893) #99896

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac620e7
[3.11] gh-99891: Fix infinite recursion in the tokenizer when showing…
pablogsal Nov 30, 2022
974dff6
Update Parser/tokenizer.c
pablogsal Nov 30, 2022
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
Prev Previous commit
Update Parser/tokenizer.c
  • Loading branch information
@pablogsal
pablogsal authored Nov 30, 2022
commit 974dff69221df4cc0e788cd63c67f459742fbc53
6 changes: 0 additions & 6 deletions Parser/tokenizer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2199,15 +2199,9 @@ _PyTokenizer_FindEncodingFilename(int fd, PyObject *filename)
return encoding;
}
}
<<<<<<< HEAD
||||||| parent of 417206a05c (gh-99891: Fix infinite recursion in the tokenizer when showing warnings (GH-99893))
struct token token;
=======
struct token token;
// We don't want to report warnings here because it could cause infinite recursion
// if fetching the encoding shows a warning.
tok->report_warnings = 0;
>>>>>>> 417206a05c (gh-99891: Fix infinite recursion in the tokenizer when showing warnings (GH-99893))
while (tok->lineno < 2 && tok->done == E_OK) {
_PyTokenizer_Get(tok, &p_start, &p_end);
}
Expand Down