From: Neil Schemenauer <nas-github@arctrix.com>
Date: Tue, 27 Oct 2020 18:55:52 +0000 (-0700)
Subject: bpo-42099: Fix reference to ob_type in unionobject.c and ceval (GH-22829)
X-Git-Tag: v3.10.0a2~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0564aafb71a153dd0aca4b9266dfae9336a4f2cb;p=thirdparty%2FPython%2Fcpython.git

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

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

diff --git a/Objects/unionobject.c b/Objects/unionobject.c
index 89fdaf42560c..1b7f8ab51a4c 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
diff --git a/Python/ceval.c b/Python/ceval.c
index 7338be57798f..13b209fc706b 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -3193,7 +3193,7 @@ main_loop:
 
                         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);