diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst index c42a5a022b7..ac0ae8cf013 100644 --- a/Doc/whatsnew/3.14.rst +++ b/Doc/whatsnew/3.14.rst @@ -346,6 +346,10 @@ ast * The ``repr()`` output for AST nodes now includes more information. (Contributed by Tomas R in :gh:`116022`.) +* :func:`ast.parse`, when called with an AST as input, now always verifies + that the root node type is appropriate. + (Contributed by Irit Katriel in :gh:`130139`.) + calendar -------- diff --git a/Include/internal/pycore_ast.h b/Include/internal/pycore_ast.h index f5bf1205a82..69abc3536e3 100644 --- a/Include/internal/pycore_ast.h +++ b/Include/internal/pycore_ast.h @@ -907,6 +907,7 @@ type_param_ty _PyAST_TypeVarTuple(identifier name, expr_ty default_value, int PyObject* PyAST_mod2obj(mod_ty t); +int PyAst_CheckMode(PyObject *ast, int mode); mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode); int PyAST_Check(PyObject* obj); diff --git a/Lib/test/test_ast/test_ast.py b/Lib/test/test_ast/test_ast.py index 434f291eebe..42dbb6e79c3 100644 --- a/Lib/test/test_ast/test_ast.py +++ b/Lib/test/test_ast/test_ast.py @@ -131,6 +131,12 @@ class AST_Tests(unittest.TestCase): tree = ast.parse(snippet) compile(tree, '', 'exec') + def test_parse_invalid_ast(self): + # see gh-130139 + for optval in (-1, 0, 1, 2): + self.assertRaises(TypeError, ast.parse, ast.Constant(42), + optimize=optval) + def test_optimization_levels__debug__(self): cases = [(-1, '__debug__'), (0, '__debug__'), (1, False), (2, False)] for (optval, expected) in cases: diff --git a/Lib/test/test_unparse.py b/Lib/test/test_unparse.py index f6c4f1f3f64..f45a651c7cc 100644 --- a/Lib/test/test_unparse.py +++ b/Lib/test/test_unparse.py @@ -422,9 +422,9 @@ class UnparseTestCase(ASTTestCase): self.check_ast_roundtrip(f"'''{docstring}'''") def test_constant_tuples(self): - self.check_src_roundtrip(ast.Constant(value=(1,), kind=None), "(1,)") + self.check_src_roundtrip(ast.Module([ast.Constant(value=(1,))]), "(1,)") self.check_src_roundtrip( - ast.Constant(value=(1, 2, 3), kind=None), "(1, 2, 3)" + ast.Module([ast.Constant(value=(1, 2, 3))]), "(1, 2, 3)" ) def test_function_type(self): diff --git a/Misc/NEWS.d/next/Library/2025-02-15-01-37-47.gh-issue-130139.gntc7B.rst b/Misc/NEWS.d/next/Library/2025-02-15-01-37-47.gh-issue-130139.gntc7B.rst new file mode 100644 index 00000000000..5cb3bf141a7 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2025-02-15-01-37-47.gh-issue-130139.gntc7B.rst @@ -0,0 +1,2 @@ +Fix bug where :func:`ast.parse` did not error on AST input which is not of the +correct type, when called with optimize=False. diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py index 7b2df738119..b2a5dd6792d 100755 --- a/Parser/asdl_c.py +++ b/Parser/asdl_c.py @@ -2166,11 +2166,35 @@ PyObject* PyAST_mod2obj(mod_ty t) } /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */ -mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) +int PyAst_CheckMode(PyObject *ast, int mode) { const char * const req_name[] = {"Module", "Expression", "Interactive"}; - int isinstance; + struct ast_state *state = get_ast_state(); + if (state == NULL) { + return -1; + } + + PyObject *req_type[3]; + req_type[0] = state->Module_type; + req_type[1] = state->Expression_type; + req_type[2] = state->Interactive_type; + + assert(0 <= mode && mode <= 2); + int isinstance = PyObject_IsInstance(ast, req_type[mode]); + if (isinstance == -1) { + return -1; + } + if (!isinstance) { + PyErr_Format(PyExc_TypeError, "expected %s node, got %.400s", + req_name[mode], _PyType_Name(Py_TYPE(ast))); + return -1; + } + return 0; +} + +mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) +{ if (PySys_Audit("compile", "OO", ast, Py_None) < 0) { return NULL; } @@ -2180,19 +2204,7 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) return NULL; } - PyObject *req_type[3]; - req_type[0] = state->Module_type; - req_type[1] = state->Expression_type; - req_type[2] = state->Interactive_type; - - assert(0 <= mode && mode <= 2); - - isinstance = PyObject_IsInstance(ast, req_type[mode]); - if (isinstance == -1) - return NULL; - if (!isinstance) { - PyErr_Format(PyExc_TypeError, "expected %s node, got %.400s", - req_name[mode], _PyType_Name(Py_TYPE(ast))); + if (PyAst_CheckMode(ast, mode) < 0) { return NULL; } @@ -2356,6 +2368,7 @@ def write_header(mod, metadata, f): f.write(textwrap.dedent(""" PyObject* PyAST_mod2obj(mod_ty t); + int PyAst_CheckMode(PyObject *ast, int mode); mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode); int PyAST_Check(PyObject* obj); diff --git a/Python/Python-ast.c b/Python/Python-ast.c index 7038e3c92ab..4adf72a8537 100644 --- a/Python/Python-ast.c +++ b/Python/Python-ast.c @@ -18161,11 +18161,35 @@ PyObject* PyAST_mod2obj(mod_ty t) } /* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */ -mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) +int PyAst_CheckMode(PyObject *ast, int mode) { const char * const req_name[] = {"Module", "Expression", "Interactive"}; - int isinstance; + struct ast_state *state = get_ast_state(); + if (state == NULL) { + return -1; + } + + PyObject *req_type[3]; + req_type[0] = state->Module_type; + req_type[1] = state->Expression_type; + req_type[2] = state->Interactive_type; + + assert(0 <= mode && mode <= 2); + int isinstance = PyObject_IsInstance(ast, req_type[mode]); + if (isinstance == -1) { + return -1; + } + if (!isinstance) { + PyErr_Format(PyExc_TypeError, "expected %s node, got %.400s", + req_name[mode], _PyType_Name(Py_TYPE(ast))); + return -1; + } + return 0; +} + +mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) +{ if (PySys_Audit("compile", "OO", ast, Py_None) < 0) { return NULL; } @@ -18175,19 +18199,7 @@ mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode) return NULL; } - PyObject *req_type[3]; - req_type[0] = state->Module_type; - req_type[1] = state->Expression_type; - req_type[2] = state->Interactive_type; - - assert(0 <= mode && mode <= 2); - - isinstance = PyObject_IsInstance(ast, req_type[mode]); - if (isinstance == -1) - return NULL; - if (!isinstance) { - PyErr_Format(PyExc_TypeError, "expected %s node, got %.400s", - req_name[mode], _PyType_Name(Py_TYPE(ast))); + if (PyAst_CheckMode(ast, mode) < 0) { return NULL; } diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 46a6fd9a8ef..a7243baa64c 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -835,6 +835,9 @@ builtin_compile_impl(PyObject *module, PyObject *source, PyObject *filename, goto error; if (is_ast) { if ((flags & PyCF_OPTIMIZED_AST) == PyCF_ONLY_AST) { + if (PyAst_CheckMode(source, compile_mode) < 0) { + goto error; + } // return an un-optimized AST result = Py_NewRef(source); }