https://github.com/python/cpython/commit/265bc19b84c34354a78abc57d47e96e717d1d5af
commit: 265bc19b84c34354a78abc57d47e96e717d1d5af
branch: 3.13
author: Miss Islington (bot) <31488909+miss-isling...@users.noreply.github.com>
committer: Eclips4 <kirill.ba...@mail.ru>
date: 2024-10-29T16:07:32Z
summary:
[3.13] gh-126105: Fix crash in `ast` module, when `._fields` is deleted
(GH-126115) (#126130)
gh-126105: Fix crash in `ast` module, when `._fields` is deleted (GH-126115)
Previously, if the `ast.AST._fields` attribute was deleted, attempts to create
a new `as`t node would crash due to the assumption that `_fields` always had a
non-NULL value. Now it has been fixed by adding an extra check to ensure that
`_fields` does not have a NULL value (this can happen when you manually remove
`_fields` attribute).
(cherry picked from commit b2eaa75b176e07730215d76d8dce4d63fb493391)
Co-authored-by: sobolevn <m...@sobolevn.me>
files:
A Misc/NEWS.d/next/Library/2024-10-29-11-45-44.gh-issue-126105.cOL-R6.rst
M Lib/test/test_ast/test_ast.py
M Parser/asdl_c.py
M Python/Python-ast.c
diff --git a/Lib/test/test_ast/test_ast.py b/Lib/test/test_ast/test_ast.py
index b789b721c5256d..0bb74582f3ecdf 100644
--- a/Lib/test/test_ast/test_ast.py
+++ b/Lib/test/test_ast/test_ast.py
@@ -72,6 +72,23 @@ def test_AST_objects(self):
# "ast.AST constructor takes 0 positional arguments"
ast.AST(2)
+ def test_AST_fields_NULL_check(self):
+ # See: https://github.com/python/cpython/issues/126105
+ old_value = ast.AST._fields
+
+ def cleanup():
+ ast.AST._fields = old_value
+ self.addCleanup(cleanup)
+
+ del ast.AST._fields
+
+ msg = "type object 'ast.AST' has no attribute '_fields'"
+ # Both examples used to crash:
+ with self.assertRaisesRegex(AttributeError, msg):
+ ast.AST(arg1=123)
+ with self.assertRaisesRegex(AttributeError, msg):
+ ast.AST()
+
def test_AST_garbage_collection(self):
class X:
pass
diff --git
a/Misc/NEWS.d/next/Library/2024-10-29-11-45-44.gh-issue-126105.cOL-R6.rst
b/Misc/NEWS.d/next/Library/2024-10-29-11-45-44.gh-issue-126105.cOL-R6.rst
new file mode 100644
index 00000000000000..547eb3af1ca064
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-10-29-11-45-44.gh-issue-126105.cOL-R6.rst
@@ -0,0 +1 @@
+Fix a crash in :mod:`ast` when the :attr:`ast.AST._fields` attribute is
deleted.
diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index ed2ea16284d0e7..936317b7ae6e0c 100755
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -881,19 +881,17 @@ def visitModule(self, mod):
Py_ssize_t i, numfields = 0;
int res = -1;
PyObject *key, *value, *fields, *attributes = NULL, *remaining_fields =
NULL;
- if (PyObject_GetOptionalAttr((PyObject*)Py_TYPE(self), state->_fields,
&fields) < 0) {
+
+ fields = PyObject_GetAttr((PyObject*)Py_TYPE(self), state->_fields);
+ if (fields == NULL) {
goto cleanup;
}
- if (fields) {
- numfields = PySequence_Size(fields);
- if (numfields == -1) {
- goto cleanup;
- }
- remaining_fields = PySet_New(fields);
- }
- else {
- remaining_fields = PySet_New(NULL);
+
+ numfields = PySequence_Size(fields);
+ if (numfields == -1) {
+ goto cleanup;
}
+ remaining_fields = PySet_New(fields);
if (remaining_fields == NULL) {
goto cleanup;
}
diff --git a/Python/Python-ast.c b/Python/Python-ast.c
index 0f04c43b34cbb2..08ac2507d984d2 100644
--- a/Python/Python-ast.c
+++ b/Python/Python-ast.c
@@ -5078,19 +5078,17 @@ ast_type_init(PyObject *self, PyObject *args, PyObject
*kw)
Py_ssize_t i, numfields = 0;
int res = -1;
PyObject *key, *value, *fields, *attributes = NULL, *remaining_fields =
NULL;
- if (PyObject_GetOptionalAttr((PyObject*)Py_TYPE(self), state->_fields,
&fields) < 0) {
+
+ fields = PyObject_GetAttr((PyObject*)Py_TYPE(self), state->_fields);
+ if (fields == NULL) {
goto cleanup;
}
- if (fields) {
- numfields = PySequence_Size(fields);
- if (numfields == -1) {
- goto cleanup;
- }
- remaining_fields = PySet_New(fields);
- }
- else {
- remaining_fields = PySet_New(NULL);
+
+ numfields = PySequence_Size(fields);
+ if (numfields == -1) {
+ goto cleanup;
}
+ remaining_fields = PySet_New(fields);
if (remaining_fields == NULL) {
goto cleanup;
}
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
