Skip to content

[3.12] gh-109341: Fix crash on compiling invalid AST including TypeAlias (GH-109349) #109381

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.

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 1 commit into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions Lib/test/test_compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,26 @@ def test_compile_ast(self):
ast.body = [_ast.BoolOp()]
self.assertRaises(TypeError, compile, ast, '<ast>', 'exec')

def test_compile_invalid_typealias(self):
# gh-109341
m = ast.Module(
body=[
ast.TypeAlias(
name=ast.Subscript(
value=ast.Name(id="foo", ctx=ast.Load()),
slice=ast.Constant(value="x"),
ctx=ast.Store(),
),
type_params=[],
value=ast.Name(id="Callable", ctx=ast.Load()),
)
],
type_ignores=[],
)

with self.assertRaisesRegex(TypeError, "TypeAlias with non-Name name"):
compile(ast.fix_missing_locations(m), "<file>", "exec")

def test_dict_evaluation_order(self):
i = 0

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix crash when compiling an invalid AST involving a :class:`ast.TypeAlias`.
5 changes: 5 additions & 0 deletions Python/ast.c
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,11 @@ validate_stmt(struct validator *state, stmt_ty stmt)
validate_expr(state, stmt->v.AnnAssign.annotation, Load);
break;
case TypeAlias_kind:
if (stmt->v.TypeAlias.name->kind != Name_kind) {
PyErr_SetString(PyExc_TypeError,
"TypeAlias with non-Name name");
return 0;
}
ret = validate_expr(state, stmt->v.TypeAlias.name, Store) &&
validate_type_params(state, stmt->v.TypeAlias.type_params) &&
validate_expr(state, stmt->v.TypeAlias.value, Load);
Expand Down