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/listobject.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/listobject.c')
-rw-r--r-- | Objects/listobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index dbbc4a9..f3821f8 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -195,8 +195,8 @@ static void list_dealloc(PyListObject *op) { int i; + PyObject_GC_UnTrack(op); Py_TRASHCAN_SAFE_BEGIN(op) - _PyObject_GC_UNTRACK(op); if (op->ob_item != NULL) { /* Do it backwards, for Christian Tismer. There's a simple test case where somehow this reduces |