#4576: fix ob_type access.

birkenfeld · birkenfeld · commit 2ed237bd2215 · 2008-12-07T14:09:20.000Z
diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
@@ -265,7 +265,7 @@ allocation and deallocation.  At a minimum, we need a deallocation method::
    {
        Py_XDECREF(self->first);
        Py_XDECREF(self->last);
-       self->ob_type->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject*)self);
    }
 
 which is assigned to the :attr:`tp_dealloc` member::
@@ -759,7 +759,7 @@ to use it::
    Noddy_dealloc(Noddy* self)
    {
        Noddy_clear(self);
-       self->ob_type->tp_free((PyObject*)self);
+       Py_TYPE(self)->tp_free((PyObject*)self);
    }
 
 Notice the use of a temporary variable in :cfunc:`Noddy_clear`. We use the
@@ -952,7 +952,7 @@ needs to be freed here as well.  Here is an example of this function::
    newdatatype_dealloc(newdatatypeobject * obj)
    {
        free(obj->obj_UnderlyingDatatypePtr);
-       obj->ob_type->tp_free(obj);
+       Py_TYPE(obj)->tp_free(obj);
    }
 
 .. index::
@@ -995,7 +995,7 @@ done.  This can be done using the :cfunc:`PyErr_Fetch` and
 
            Py_DECREF(self->my_callback);
        }
-       obj->ob_type->tp_free((PyObject*)self);
+       Py_TYPE(obj)->tp_free((PyObject*)self);
    }
 
 

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ allocation and deallocation. At a minimum, we need a deallocation method::`
`265`	`265`	`{`
`266`	`266`	`Py_XDECREF(self->first);`
`267`	`267`	`Py_XDECREF(self->last);`
`268`		`- self->ob_type->tp_free((PyObject*)self);`
	`268`	`+ Py_TYPE(self)->tp_free((PyObject*)self);`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	which is assigned to the :attr:`tp_dealloc` member::
`@@ -759,7 +759,7 @@ to use it::`
`759`	`759`	`Noddy_dealloc(Noddy* self)`
`760`	`760`	`{`
`761`	`761`	`Noddy_clear(self);`
`762`		`- self->ob_type->tp_free((PyObject*)self);`
	`762`	`+ Py_TYPE(self)->tp_free((PyObject*)self);`
`763`	`763`	`}`
`764`	`764`
`765`	`765`	Notice the use of a temporary variable in :cfunc:`Noddy_clear`. We use the
`@@ -952,7 +952,7 @@ needs to be freed here as well. Here is an example of this function::`
`952`	`952`	`newdatatype_dealloc(newdatatypeobject * obj)`
`953`	`953`	`{`
`954`	`954`	`free(obj->obj_UnderlyingDatatypePtr);`
`955`		`- obj->ob_type->tp_free(obj);`
	`955`	`+ Py_TYPE(obj)->tp_free(obj);`
`956`	`956`	`}`
`957`	`957`
`958`	`958`	`.. index::`
@@ -995,7 +995,7 @@ done. This can be done using the :cfunc:`PyErr_Fetch` and
`995`	`995`
`996`	`996`	`Py_DECREF(self->my_callback);`
`997`	`997`	`}`
`998`		`- obj->ob_type->tp_free((PyObject*)self);`
	`998`	`+ Py_TYPE(obj)->tp_free((PyObject*)self);`
`999`	`999`	`}`
`1000`	`1000`
`1001`	`1001`