commit 0564aafb71a153dd0aca4b9266dfae9336a4f2cb
author Neil Schemenauer <nas-github@arctrix.com> Tue Oct 27 11:55:52 2020 -0700
committer GitHub <noreply@github.com> Tue Oct 27 18:55:52 2020 +0000
tree d1bb2a8f760702cccc690f2cbc79bbf916c481b3
parent 15acc4eaba8519d7d5f2acaffde65446b44dcf79

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

* Use Py_TYPE() rather than o->ob_type.

Objects/unionobject.c

diff --git a/Objects/unionobject.c b/Objects/unionobject.c
index 89fdaf4..1b7f8ab 100644
--- a/Objects/unionobject.c
+++ b/Objects/unionobject.c
@@ -15,7 +15,7 @@ unionobject_dealloc(PyObject *self)
     unionobject *alias = (unionobject *)self;
 
     Py_XDECREF(alias->args);
-    self->ob_type->tp_free(self);
+    Py_TYPE(self)->tp_free(self);
 }
 
 static Py_hash_t

Python/ceval.c

diff --git a/Python/ceval.c b/Python/ceval.c
index 7338be5..13b209f 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3193,7 +3193,7 @@ _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int throwflag)
 
                         descr = _PyType_Lookup(type, name);
                         if (descr == NULL ||
-                            descr->ob_type->tp_descr_get == NULL ||
+                            Py_TYPE(descr)->tp_descr_get == NULL ||
                             !PyDescr_IsData(descr))
                         {
                             dictptr = (PyObject **) ((char *)owner + type->tp_dictoffset);