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/tupleobject.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/tupleobject.c')
| -rw-r--r-- | Objects/tupleobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/tupleobject.c b/Objects/tupleobject.c index 27598ed..ab792de 100644 --- a/Objects/tupleobject.c +++ b/Objects/tupleobject.c @@ -139,8 +139,8 @@ tupledealloc(register PyTupleObject *op) { register int i; register int len = op->ob_size; + PyObject_GC_UnTrack(op); Py_TRASHCAN_SAFE_BEGIN(op) - _PyObject_GC_UNTRACK(op); if (len > 0) { i = len; while (--i >= 0) |