bpo-42099: Fix reference to ob_type in unionobject.c and ceval (GH-22829)

* Use Py_TYPE() rather than o->ob_type.
This commit is contained in:
Neil Schemenauer 2020-10-27 11:55:52 -07:00 committed by GitHub
parent 15acc4eaba
commit 0564aafb71
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -15,7 +15,7 @@ unionobject_dealloc(PyObject *self)
unionobject *alias = (unionobject *)self; unionobject *alias = (unionobject *)self;
Py_XDECREF(alias->args); Py_XDECREF(alias->args);
self->ob_type->tp_free(self); Py_TYPE(self)->tp_free(self);
} }
static Py_hash_t static Py_hash_t

View File

@ -3193,7 +3193,7 @@ main_loop:
descr = _PyType_Lookup(type, name); descr = _PyType_Lookup(type, name);
if (descr == NULL || if (descr == NULL ||
descr->ob_type->tp_descr_get == NULL || Py_TYPE(descr)->tp_descr_get == NULL ||
!PyDescr_IsData(descr)) !PyDescr_IsData(descr))
{ {
dictptr = (PyObject **) ((char *)owner + type->tp_dictoffset); dictptr = (PyObject **) ((char *)owner + type->tp_dictoffset);