Mercurial > cpython-lru_cache-weakref
diff Python/compile.c @ 16753:51977af230fa legacy-trunk
Fix for bug 133489: compiler leaks memory
Two different but related problems:
1. PySymtable_Free() must explicitly DECREF(st->st_cur), which should
always point to the global symtable entry. This entry is setup by the
first enter_scope() call, but there is never a corresponding
exit_scope() call.
Since each entry has a reference to scopes defined within it, the
missing DECREF caused all symtable entries to be leaked.
2. The leak here masked a separate problem with
PySymtableEntry_New(). When the requested entry was found in
st->st_symbols, the entry was returned without doing an INCREF.
And problem c) The ste_children slot was getting two copies of each
child entry, because it was populating the slot on the first and
second passes. Now only populate on the first pass.
| author | Jeremy Hylton <jeremy@alum.mit.edu> |
|---|---|
| date | Fri, 23 Feb 2001 17:55:27 +0000 |
| parents | 7334b2cedda8 |
| children | 23c7a0108f59 |
line wrap: on
line diff
--- a/Python/compile.c Fri Feb 23 16:46:39 2001 +0000 +++ b/Python/compile.c Fri Feb 23 17:55:27 2001 +0000 @@ -3912,8 +3912,10 @@ PyErr_SetString(PyExc_SystemError, "lost syntax error"); } exit: - if (base == NULL) + if (base == NULL) { PySymtable_Free(sc.c_symtable); + sc.c_symtable = NULL; + } com_free(&sc); return co; } @@ -4193,6 +4195,7 @@ { Py_XDECREF(st->st_symbols); Py_XDECREF(st->st_stack); + Py_XDECREF(st->st_cur); PyMem_Free((void *)st); } @@ -4359,10 +4362,11 @@ PySymtableEntry_New(st, name, type, lineno); if (strcmp(name, TOP) == 0) st->st_global = st->st_cur->ste_symbols; - if (prev) + if (prev && st->st_pass == 1) { if (PyList_Append(prev->ste_children, (PyObject *)st->st_cur) < 0) st->st_errors++; + } } static int
