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

[benjamin.peterson]

Author: benjamin.peterson
Date: Sat Apr 25 03:37:40 2009
New Revision: 71863

Log:
Merged revisions 71862 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r71862 | benjamin.peterson | 2009-04-24 20:08:45 -0500 (Fri, 24 Apr 2009) | 9 lines
  
  Merged revisions 71860 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r71860 | benjamin.peterson | 2009-04-24 19:41:22 -0500 (Fri, 24 Apr 2009) | 1 line
    
    fix a segfault when setting __class__ in __del__ #5283
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/test/test_descr.py
   python/branches/release30-maint/Misc/NEWS
   python/branches/release30-maint/Objects/typeobject.c

Modified: python/branches/release30-maint/Lib/test/test_descr.py
==============================================================================
--- python/branches/release30-maint/Lib/test/test_descr.py	(original)
+++ python/branches/release30-maint/Lib/test/test_descr.py	Sat Apr 25 03:37:40 2009
@@ -2712,6 +2712,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/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Sat Apr 25 03:37:40 2009
@@ -16,6 +16,8 @@
   imp.find_module() were converted to UTF-8 while the path is
   converted to the default filesystem encoding, causing nonsense.
 
+- Issue #5283: Setting __class__ in __del__ caused a segfault.
+
 - Issue #5759: float() didn't call __float__ on str subclasses.
 
 - Issue #5787: object.__getattribute__(some_type, "__bases__") segfaulted on

Modified: python/branches/release30-maint/Objects/typeobject.c
==============================================================================
--- python/branches/release30-maint/Objects/typeobject.c	(original)
+++ python/branches/release30-maint/Objects/typeobject.c	Sat Apr 25 03:37:40 2009
@@ -877,6 +877,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);
@@ -958,6 +961,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.
 	 */