diff options
| author | Philip Jenvey <pjenvey@underboss.org> | 2009-09-29 04:57:18 (GMT) |
|---|---|---|
| committer | Philip Jenvey <pjenvey@underboss.org> | 2009-09-29 04:57:18 (GMT) |
| commit | 26713cade1e8e2e2458062c4f0be0b53ae436753 (patch) | |
| tree | f5c5ce6f2702187ad41cee3e72dbbad28832d707 /Modules | |
| parent | 12c4bdb0e8d96640423bd6878dac2aecacb2d741 (diff) | |
| download | cpython-26713cade1e8e2e2458062c4f0be0b53ae436753.zip cpython-26713cade1e8e2e2458062c4f0be0b53ae436753.tar.gz cpython-26713cade1e8e2e2458062c4f0be0b53ae436753.tar.bz2 | |
Recorded merge of revisions 75123 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75123 | philip.jenvey | 2009-09-28 21:32:44 -0700 (Mon, 28 Sep 2009) | 4 lines
#6990: clear threading.local's key only after its thread state is removed:
fixes local subclasses leaving old state around after a ref cycle GC which
could be recycled by new locals
........
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_threadmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c index a031998..744e94d 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -239,7 +239,6 @@ local_traverse(localobject *self, visitproc visit, void *arg) static int local_clear(localobject *self) { - Py_CLEAR(self->key); Py_CLEAR(self->args); Py_CLEAR(self->kw); Py_CLEAR(self->dict); @@ -261,6 +260,7 @@ local_dealloc(localobject *self) PyDict_DelItem(tstate->dict, self->key); } + Py_XDECREF(self->key); local_clear(self); Py_TYPE(self)->tp_free((PyObject*)self); } |