Issue #15142: Fix reference leak when deallocating instances of types created using PyType_FromSpec().

pitrou · pitrou · commit 99cc629969cd · 2012-06-23T14:42:38.000+02:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.4
 Core and Builtins
 -----------------
 
+- Issue #15142: Fix reference leak when deallocating instances of types
+  created using PyType_FromSpec().
+
 - Issue #10053: Don't close FDs when FileIO.__init__ fails. Loosely based on
   the work by Hirokazu Yamamoto.
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
@@ -2387,6 +2387,12 @@ PyType_FromSpec(PyType_Spec *spec)
             res->ht_type.tp_doc = tp_doc;
         }
     }
+    if (res->ht_type.tp_dealloc == NULL) {
+        /* It's a heap type, so needs the heap types' dealloc.
+           subtype_dealloc will call the base type's tp_dealloc, if
+           necessary. */
+        res->ht_type.tp_dealloc = subtype_dealloc;
+    }
 
     if (PyType_Ready(&res->ht_type) < 0)
         goto fail;

Original file line number	Diff line number	Diff line change
`@@ -2387,6 +2387,12 @@ PyType_FromSpec(PyType_Spec *spec)`
`2387`	`2387`	`res->ht_type.tp_doc = tp_doc;`
`2388`	`2388`	`}`
`2389`	`2389`	`}`
	`2390`	`+ if (res->ht_type.tp_dealloc == NULL) {`
	`2391`	`+ /* It's a heap type, so needs the heap types' dealloc.`
	`2392`	`+ subtype_dealloc will call the base type's tp_dealloc, if`
	`2393`	`+ necessary. */`
	`2394`	`+ res->ht_type.tp_dealloc = subtype_dealloc;`
	`2395`	`+ }`
`2390`	`2396`
`2391`	`2397`	`if (PyType_Ready(&res->ht_type) < 0)`
`2392`	`2398`	`goto fail;`