Skip to content

gh-104482: Fix error handling bugs in ast.c #104483

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
merged 11 commits into from
May 15, 2023
Merged

gh-104482: Fix error handling bugs in ast.c #104483

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5a4e346
gh-104482: Fix error handling bugs in ast.c
iritkatriel May 14, 2023
0d9d4b0
whitespace
iritkatriel May 14, 2023
35dae76
📜🤖 Added by blurb_it.
blurb-it[bot] May 14, 2023
2f185bc
Merge branch 'main' into missingBreak
iritkatriel May 14, 2023
e2f0e8e
Merge branch 'main' into missingBreak
iritkatriel May 14, 2023
31b611e
Merge branch 'main' into missingBreak
iritkatriel May 15, 2023
72577b1
add one more missing break
iritkatriel May 15, 2023
d925fff
add test to cover bad name case. Add assertions in validation functio…
iritkatriel May 15, 2023
9dd4fee
Update news
iritkatriel May 15, 2023
43a9d47
missed a few loops
iritkatriel May 15, 2023
8370aef
fix news wording
iritkatriel May 15, 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
Prev Previous commit
Next Next commit
missed a few loops
  • Loading branch information
@iritkatriel
iritkatriel committed May 15, 2023
commit 43a9d47e3db9563a804a225873bd1f8bb3ce0732
9 changes: 3 additions & 6 deletions Python/ast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,11 @@ static int
validate_comprehension(struct validator *state, asdl_comprehension_seq *gens)
{
assert(!PyErr_Occurred());
Py_ssize_t i;
if (!asdl_seq_LEN(gens)) {
PyErr_SetString(PyExc_ValueError, "comprehension with no generators");
return 0;
}
for (i = 0; i < asdl_seq_LEN(gens); i++) {
for (Py_ssize_t i = 0; i < asdl_seq_LEN(gens); i++) {
comprehension_ty comp = asdl_seq_GET(gens, i);
if (!validate_expr(state, comp->target, Store) ||
!validate_expr(state, comp->iter, Load) ||
Expand All @@ -86,8 +85,7 @@ static int
validate_keywords(struct validator *state, asdl_keyword_seq *keywords)
{
assert(!PyErr_Occurred());
Py_ssize_t i;
for (i = 0; i < asdl_seq_LEN(keywords); i++)
for (Py_ssize_t i = 0; i < asdl_seq_LEN(keywords); i++)
if (!validate_expr(state, (asdl_seq_GET(keywords, i))->value, Load))
return 0;
return 1;
Expand All @@ -97,8 +95,7 @@ static int
validate_args(struct validator *state, asdl_arg_seq *args)
{
assert(!PyErr_Occurred());
Py_ssize_t i;
for (i = 0; i < asdl_seq_LEN(args); i++) {
for (Py_ssize_t i = 0; i < asdl_seq_LEN(args); i++) {
arg_ty arg = asdl_seq_GET(args, i);
VALIDATE_POSITIONS(arg);
if (arg->annotation && !validate_expr(state, arg->annotation, Load))
Expand Down