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

Variety of small INC/DECREF patches that fix reported memory leaks

Browse source 
with free variables.  Thanks to Martin v. Loewis for finding two of
the problems.  This fixes SF buf 405583.

There is also a C API change: PyFrame_New() is reverting to its
pre-2.1 signature.  The change introduced by nested scopes was a
mistake.  XXX Is this okay between beta releases?

cell_clear(), the GC helper, must decref its reference to break
cycles.

frame_dealloc() must dealloc all cell vars and free vars in addition
to locals.

eval_code2() setup code must INCREF cells it copies out of the
closure.

The STORE_DEREF opcode implementation must DECREF the object it passes
to PyCell_Set().
This commit is contained in:
Jeremy Hylton 2001-03-13 01:58:22 +00:00
parent 93fe96a3c8
commit 30c9f3991c
5 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Objects/cellobject.c
View file

@ -83,6 +83,7 @@ cell_traverse(PyCellObject *op, visitproc visit, void *arg)
static int
cell_clear(PyCellObject *op)
{
Py_XDECREF(op->ob_ref);
op->ob_ref = NULL;
return 0;
}

7
Objects/frameobject.c
View file

@ -65,13 +65,14 @@ static PyFrameObject *free_list = NULL;
static void
frame_dealloc(PyFrameObject *f)
{
int i;
int i, slots;
PyObject **fastlocals;
Py_TRASHCAN_SAFE_BEGIN(f)
/* Kill all local variables */
slots = f->f_nlocals + f->f_ncells + f->f_nfreevars;
fastlocals = f->f_localsplus;
for (i = f->f_nlocals; --i >= 0; ++fastlocals) {
for (i = slots; --i >= 0; ++fastlocals) {
Py_XDECREF(*fastlocals);
}
@ -108,7 +109,7 @@ PyTypeObject PyFrame_Type = {
PyFrameObject *
PyFrame_New(PyThreadState *tstate, PyCodeObject *code, PyObject *globals,
PyObject *locals, PyObject *closure)
PyObject *locals)
{
PyFrameObject *back = tstate->frame;
static PyObject *builtin_object;