diff options
| author | Brett Cannon <bcannon@gmail.com> | 2007-01-23 22:41:20 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2007-01-23 22:41:20 (GMT) |
| commit | 75ba075110bbb3dcac6e975540bf8eda65774ec1 (patch) | |
| tree | 012de9cedbf5036184d8bbbea0ec4da61ea1f00f /Objects/weakrefobject.c | |
| parent | 601d03a5be6a6952ecb57750f0365d6ef2abd4eb (diff) | |
| download | cpython-75ba075110bbb3dcac6e975540bf8eda65774ec1.zip cpython-75ba075110bbb3dcac6e975540bf8eda65774ec1.tar.gz cpython-75ba075110bbb3dcac6e975540bf8eda65774ec1.tar.bz2 | |
If you created a weakref in an object's __del__ method to itself it would
segfault the interpreter during weakref clean up. Now any new weakrefs created
after __del__ is run are removed silently.
Fixes bug #1377858 and the weakref_in_del crasher for new-style classes.
Classic classes are still affected.
Diffstat (limited to 'Objects/weakrefobject.c')
| -rw-r--r-- | Objects/weakrefobject.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 826f571..a404f29 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -57,6 +57,9 @@ clear_weakref(PyWeakReference *self) PyWeakref_GET_OBJECT(self)); if (*list == self) + /* If 'self' is the end of the list (and thus self->wr_next == NULL) + then the weakref list itself (and thus the value of *list) will + end up being set to NULL. */ *list = self->wr_next; self->wr_object = Py_None; if (self->wr_prev != NULL) |