mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix SF bug #489581: __slots__ leak.

Browse source 
It was easier than I thought, assuming that no other things contribute
to the instance size besides slots -- a pretty good bet.  With a test
suite, no less!
This commit is contained in:
Guido van Rossum 2001-12-05 22:45:48 +00:00
parent 9145be4310
commit 33bab01da6
3 changed files with 59 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Objects/typeobject.c
View file

@ -304,7 +304,7 @@ call_finalizer(PyObject *self)
static void
subtype_dealloc(PyObject *self)
{
PyTypeObject *type, *base;
PyTypeObject *type, *base, *temp;
destructor f;
/* This exists so we can DECREF self->ob_type */
@ -314,10 +314,30 @@ subtype_dealloc(PyObject *self)
/* Find the nearest base with a different tp_dealloc */
type = self->ob_type;
base = type->tp_base;
base = type;
while ((f = base->tp_dealloc) == subtype_dealloc) {
temp = base;
base = base->tp_base;
assert(base);
/* While we're at it, clear __slots__ variables */
if (temp->tp_basicsize != base->tp_basicsize &&
temp->tp_itemsize == 0)
{
char *addr = ((char *)self);
char *p = addr + base->tp_basicsize;
char *q = addr + temp->tp_basicsize;
for (; p < q; p += sizeof(PyObject *)) {
PyObject **pp;
if (p == addr + type->tp_dictoffset ||
p == addr + type->tp_weaklistoffset)
continue;
pp = (PyObject **)p;
if (*pp != NULL) {
Py_DECREF(*pp);
*pp = NULL;
}
}
}
}
/* If we added a dict, DECREF it */