mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

bpo-44143: Fix crash in the parser when raising tokenizer errors with an exception set (GH-26144) (GH-26148)

Browse source 
(cherry picked from commit 80b089179f)

Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
This commit is contained in:
Miss Islington (bot) 2021-05-15 10:39:18 -07:00 • committed by GitHub
parent a38db84122
commit 1afaaf5a2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Lib/test/test_exceptions.py
View file

@ -242,6 +242,7 @@ class ExceptionTests(unittest.TestCase):
""", 9, 24) """, 9, 24)
check("pass\npass\npass\n(1+)\npass\npass\npass", 4, 4) check("pass\npass\npass\n(1+)\npass\npass\npass", 4, 4)
check("(1+)", 1, 4) check("(1+)", 1, 4)
check("[interesting\nfoo()\n", 1, 1)
# Errors thrown by symtable.c # Errors thrown by symtable.c
check('x = [(yield i) for i in range(3)]', 1, 5) check('x = [(yield i) for i in range(3)]', 1, 5)

2
Misc/NEWS.d/next/Core and Builtins/2021-05-15-17-30-57.bpo-44143.7UTS6H.rst Normal file
View file

@ -0,0 +1,2 @@
Fixed a crash in the parser that manifest when raising tokenizer errors when
an existing exception was present. Patch by Pablo Galindo.

1
Parser/pegen.c
View file

@ -1259,6 +1259,7 @@ _PyPegen_check_tokenizer_errors(Parser *p) {
if (p->tok->level != 0) { if (p->tok->level != 0) {
int error_lineno = p->tok->parenlinenostack[p->tok->level-1]; int error_lineno = p->tok->parenlinenostack[p->tok->level-1];
if (current_err_line > error_lineno) { if (current_err_line > error_lineno) {
PyErr_Clear();
raise_unclosed_parentheses_error(p); raise_unclosed_parentheses_error(p);
return -1; return -1;
} }