mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
This is Neil's fix for SF bug 535905 (Evil Trashcan and GC interaction).
The fix makes it possible to call PyObject_GC_UnTrack() more than once on the same object, and then move the PyObject_GC_UnTrack() call to *before* the trashcan code is invoked. BUGFIX CANDIDATE!
This commit is contained in:
parent
31f8483eef
commit
ff413af605
5 changed files with 7 additions and 5 deletions
|
@ -67,8 +67,8 @@ frame_dealloc(PyFrameObject *f)
|
|||
PyObject **fastlocals;
|
||||
PyObject **p;
|
||||
|
||||
PyObject_GC_UnTrack(f);
|
||||
Py_TRASHCAN_SAFE_BEGIN(f)
|
||||
_PyObject_GC_UNTRACK(f);
|
||||
/* Kill all local variables */
|
||||
slots = f->f_nlocals + f->f_ncells + f->f_nfreevars;
|
||||
fastlocals = f->f_localsplus;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue