[Python-checkins] r71861 - in python/branches/release26-maint: Lib/test/test_descr.py Misc/NEWS Objects/typeobject.c

Sat Apr 25 02:44:45 CEST 2009

Author: benjamin.peterson
Date: Sat Apr 25 02:44:44 2009
New Revision: 71861
Log:
Merged revisions 71860 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r71860 | benjamin.peterson | 2009年04月24日 19:41:22 -0500 (2009年4月24日) | 1 line
 
 fix a segfault when setting __class__ in __del__ #5283
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/test/test_descr.py
 python/branches/release26-maint/Misc/NEWS
 python/branches/release26-maint/Objects/typeobject.c
Modified: python/branches/release26-maint/Lib/test/test_descr.py
==============================================================================

--- python/branches/release26-maint/Lib/test/test_descr.py	(original)
+++ python/branches/release26-maint/Lib/test/test_descr.py	Sat Apr 25 02:44:44 2009
@@ -2959,6 +2959,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
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sat Apr 25 02:44:44 2009
@@ -15,6 +15,8 @@
 - Issue #5787: object.__getattribute__(some_type, "__bases__") segfaulted on
 some builtin types.
 
+- Issue #5283: Setting __class__ in __del__ caused a segfault.
+
 - Issue #5759: float() didn't call __float__ on str subclasses.
 
 Library
Modified: python/branches/release26-maint/Objects/typeobject.c
==============================================================================
--- python/branches/release26-maint/Objects/typeobject.c	(original)
+++ python/branches/release26-maint/Objects/typeobject.c	Sat Apr 25 02:44:44 2009
@@ -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.
 	 */
