Mercurial > cpython-lru_cache-weakref
diff Objects/tupleobject.c @ 57667:79e0dbb6c4b8 3.1
Merged revisions 76764 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76764 | antoine.pitrou | 2009-12-12 20:18:27 +0100 (sam., 12 déc. 2009) | 12 lines
Merged revisions 76763 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76763 | antoine.pitrou | 2009-12-12 20:13:08 +0100 (sam., 12 déc. 2009) | 7 lines
Issue #7466: segmentation fault when the garbage collector is called
in the middle of populating a tuple. Patch by Florent Xicluna.
(note: no NEWS entry for trunk since the bug was introduced in 2.7/3.1)
........
................
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Sat, 12 Dec 2009 19:26:06 +0000 |
| parents | 67fb9032d43a |
| children | 8d48f9b59689 |
line wrap: on
line diff
--- a/Objects/tupleobject.c Sat Dec 12 18:38:24 2009 +0000 +++ b/Objects/tupleobject.c Sat Dec 12 19:26:06 2009 +0000 @@ -850,7 +850,8 @@ /* XXX UNREF/NEWREF interface should be more symmetrical */ _Py_DEC_REFTOTAL; - _PyObject_GC_UNTRACK(v); + if (_PyObject_GC_IS_TRACKED(v)) + _PyObject_GC_UNTRACK(v); _Py_ForgetReference((PyObject *) v); /* DECREF items deleted by shrinkage */ for (i = newsize; i < oldsize; i++) {