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

[3.10] bpo-44335: Ensure the tokenizer doesn't go into Python with the error set (GH-26608) #26610

Merged
merged 1 commit into from Jun 8, 2021
Merged

[3.10] bpo-44335: Ensure the tokenizer doesn't go into Python with the error set (GH-26608) #26610

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 17 additions & 3 deletions Parser/pegen.c
View file
Open in desktop
Expand Up @@ -1251,9 +1251,14 @@ _PyPegen_check_tokenizer_errors(Parser *p) {
return 0;
}

PyObject *type, *value, *traceback;
PyErr_Fetch(&type, &value, &traceback);

Token *current_token = p->known_err_token != NULL ? p->known_err_token : p->tokens[p->fill - 1];
Py_ssize_t current_err_line = current_token->lineno;

int ret = 0;

for (;;) {
const char *start;
const char *end;
Expand All @@ -1262,9 +1267,9 @@ _PyPegen_check_tokenizer_errors(Parser *p) {
if (p->tok->level != 0) {
int error_lineno = p->tok->parenlinenostack[p->tok->level-1];
if (current_err_line > error_lineno) {
PyErr_Clear();
raise_unclosed_parentheses_error(p);
return -1;
ret = -1;
goto exit;
}
}
break;
Expand All @@ -1276,7 +1281,16 @@ _PyPegen_check_tokenizer_errors(Parser *p) {
break;
}

return 0;

exit:
if (PyErr_Occurred()) {
Py_XDECREF(value);
Py_XDECREF(type);
Py_XDECREF(traceback);
} else {
PyErr_Restore(type, value, traceback);
}
return ret;
}

void *
Expand Down