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

nascheme · web-flow · commit 0564aafb71a1 · 2020-10-27T18:55:52.000Z
* Use Py_TYPE() rather than o-&gt;ob_type.
diff --git 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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ unionobject_dealloc(PyObject *self)`
`15`	`15`	`unionobject alias = (unionobject )self;`
`16`	`16`
`17`	`17`	`Py_XDECREF(alias->args);`
`18`		`- self->ob_type->tp_free(self);`
	`18`	`+ Py_TYPE(self)->tp_free(self);`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`static Py_hash_t`
Original file line number	Diff line number	Diff line change
`@@ -3193,7 +3193,7 @@ _PyEval_EvalFrameDefault(PyThreadState tstate, PyFrameObject f, int throwflag)`
`3193`	`3193`
`3194`	`3194`	`descr = _PyType_Lookup(type, name);`
`3195`	`3195`	`if (descr == NULL \|\|`
`3196`		`- descr->ob_type->tp_descr_get == NULL \|\|`
	`3196`	`+ Py_TYPE(descr)->tp_descr_get == NULL \|\|`
`3197`	`3197`	`!PyDescr_IsData(descr))`
`3198`	`3198`	`{`
`3199`	`3199`	`dictptr = (PyObject *) ((char )owner + type->tp_dictoffset);`