diff options
| author | Guido van Rossum <guido@python.org> | 2002-03-28 20:34:59 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2002-03-28 20:34:59 (GMT) |
| commit | ff413af605d7aab610272c5668bc870ebcbf56ef (patch) | |
| tree | 1a79acab5df1da3a36e5b78c093793f192b2c269 /Objects/frameobject.c | |
| parent | 31f8483eef19ebf40c7831d79cac270e69a96ce0 (diff) | |
| download | cpython-ff413af605d7aab610272c5668bc870ebcbf56ef.zip cpython-ff413af605d7aab610272c5668bc870ebcbf56ef.tar.gz cpython-ff413af605d7aab610272c5668bc870ebcbf56ef.tar.bz2 | |
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!
Diffstat (limited to 'Objects/frameobject.c')
| -rw-r--r-- | Objects/frameobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c index cf3d73a..8e4c60f 100644 --- a/Objects/frameobject.c +++ b/Objects/frameobject.c @@ -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; |