fix a segfault when setting __class__ in __del__ #5283
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 05b4486..ae22af7 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -3003,6 +3003,16 @@
continue
cant(cls(), cls2)
+ # Issue5283: when __class__ changes in __del__, the wrong
+ # type gets DECREF'd.
+ class O(object):
+ pass
+ class A(object):
+ def __del__(self):
+ self.__class__ = O
+ l = [A() for x in range(100)]
+ del l
+
def test_set_dict(self):
# Testing __dict__ assignment...
class C(object): pass
diff --git a/Misc/NEWS b/Misc/NEWS
index 110044a..472c7e6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,8 @@
Core and Builtins
-----------------
+- Issue #5283: Setting __class__ in __del__ caused a segfault.
+
- Issue #5816: complex(repr(z)) now recovers z exactly, even when
z involves nans, infs or negative zeros.
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index cf5e2a9..304066f 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -928,6 +928,9 @@
assert(base);
}
+ /* Extract the type again; tp_del may have changed it */
+ type = Py_TYPE(self);
+
/* Call the base tp_dealloc() */
assert(basedealloc);
basedealloc(self);
@@ -1009,6 +1012,9 @@
}
}
+ /* Extract the type again; tp_del may have changed it */
+ type = Py_TYPE(self);
+
/* Call the base tp_dealloc(); first retrack self if
* basedealloc knows about gc.
*/