Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-96046: Initialize ht_cached_keys in PyType_Ready() (GH-96047)

This commit is contained in:
Christian Heimes 2022-08-22 07:24:03 +02:00 committed by GitHub
parent d8c7a1174c
commit 53e6a9a725
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS.d/next/Core and Builtins/2022-08-18-13-47-59.gh-issue-96046.5Hqbka.rst Normal file
View File

@ -0,0 +1,4 @@
:c:func:`PyType_Ready` now initializes ``ht_cached_keys`` and performs
additional checks to ensure that type objects are properly configured. This
avoids crashes in 3rd party packages that don't use regular API to create
new types.

35
Objects/typeobject.c
View File

@ -3287,11 +3287,6 @@ type_new_impl(type_new_ctx *ctx)
// Put the proper slots in place // Put the proper slots in place
fixup_slot_dispatchers(type); fixup_slot_dispatchers(type);
if (type->tp_flags & Py_TPFLAGS_MANAGED_DICT) {
PyHeapTypeObject *et = (PyHeapTypeObject*)type;
et->ht_cached_keys = _PyDict_NewKeysForClass();
}
if (type_new_set_names(type) < 0) { if (type_new_set_names(type) < 0) {
goto error; goto error;
} }
@ -3836,10 +3831,6 @@ PyType_FromMetaclass(PyTypeObject *metaclass, PyObject *module,
goto finally; goto finally;
} }
if (type->tp_flags & Py_TPFLAGS_MANAGED_DICT) {
res->ht_cached_keys = _PyDict_NewKeysForClass();
}
if (type->tp_doc) { if (type->tp_doc) {
PyObject *__doc__ = PyUnicode_FromString(_PyType_DocWithoutSignature(type->tp_name, type->tp_doc)); PyObject *__doc__ = PyUnicode_FromString(_PyType_DocWithoutSignature(type->tp_name, type->tp_doc));
if (!__doc__) { if (!__doc__) {
@ -6774,6 +6765,29 @@ type_ready_set_new(PyTypeObject *type)
return 0; return 0;
} }
static int
type_ready_managed_dict(PyTypeObject *type)
{
if (!(type->tp_flags & Py_TPFLAGS_MANAGED_DICT)) {
return 0;
}
if (!(type->tp_flags & Py_TPFLAGS_HEAPTYPE)) {
PyErr_Format(PyExc_SystemError,
"type %s has the Py_TPFLAGS_MANAGED_DICT flag "
"but not Py_TPFLAGS_HEAPTYPE flag",
type->tp_name);
return -1;
}
PyHeapTypeObject* et = (PyHeapTypeObject*)type;
if (et->ht_cached_keys == NULL) {
et->ht_cached_keys = _PyDict_NewKeysForClass();
if (et->ht_cached_keys == NULL) {
PyErr_NoMemory();
return -1;
}
}
return 0;
}
static int static int
type_ready_post_checks(PyTypeObject *type) type_ready_post_checks(PyTypeObject *type)
@ -6852,6 +6866,9 @@ type_ready(PyTypeObject *type)
if (type_ready_add_subclasses(type) < 0) { if (type_ready_add_subclasses(type) < 0) {
return -1; return -1;
} }
if (type_ready_managed_dict(type) < 0) {
return -1;
}
if (type_ready_post_checks(type) < 0) { if (type_ready_post_checks(type) < 0) {
return -1; return -1;
} }