Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

/* XXX From here until type is allocated, "return NULL" leaks bases! */ 

Sure looks like it to me! <wink>

When I run the leak2.py script I posted to python-dev, I only see
three reference leaks in all of test_descr.  When I run
test_descr.test_main, I still see 46 leaks.  This clearly demands
posting a yelp to python-dev :-)

This certainly should be applied to release23-maint, and in all
likelyhood release22-maint as well.
This commit is contained in:
Michael W. Hudson 2003-08-08 13:57:22 +00:00
parent 5475f2394a
commit a6a277d831
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Objects/typeobject.c
View File

@ -1618,12 +1618,15 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
/* Calculate best base, and check that all bases are type objects */ /* Calculate best base, and check that all bases are type objects */
base = best_base(bases); base = best_base(bases);
if (base == NULL) if (base == NULL) {
Py_DECREF(bases);
return NULL; return NULL;
}
if (!PyType_HasFeature(base, Py_TPFLAGS_BASETYPE)) { if (!PyType_HasFeature(base, Py_TPFLAGS_BASETYPE)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"type '%.100s' is not an acceptable base type", "type '%.100s' is not an acceptable base type",
base->tp_name); base->tp_name);
Py_DECREF(bases);
return NULL; return NULL;
} }
@ -1650,8 +1653,10 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
slots = Py_BuildValue("(O)", slots); slots = Py_BuildValue("(O)", slots);
else else
slots = PySequence_Tuple(slots); slots = PySequence_Tuple(slots);
if (slots == NULL) if (slots == NULL) {
Py_DECREF(bases);
return NULL; return NULL;
}
assert(PyTuple_Check(slots)); assert(PyTuple_Check(slots));
/* Are slots allowed? */ /* Are slots allowed? */
@ -1662,6 +1667,7 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
"not supported for subtype of '%s'", "not supported for subtype of '%s'",
base->tp_name); base->tp_name);
bad_slots: bad_slots:
Py_DECREF(bases);
Py_DECREF(slots); Py_DECREF(slots);
return NULL; return NULL;
} }
@ -1773,6 +1779,7 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
type = (PyTypeObject *)metatype->tp_alloc(metatype, nslots); type = (PyTypeObject *)metatype->tp_alloc(metatype, nslots);
if (type == NULL) { if (type == NULL) {
Py_XDECREF(slots); Py_XDECREF(slots);
Py_DECREF(bases);
return NULL; return NULL;
} }