PyType_Ready(): Complain if the type is a base type, and gc'able, and

tp_free is NULL or PyObject_Del at the end.  Because it's a base type
it must call tp_free in its dealloc function, and because it's gc'able
it must not call PyObject_Del.

inherit_slots():  Don't inherit tp_free unless the type and its base
agree about whether they're gc'able.  If the type is gc'able and the
base is not, and the base uses the default PyObject_Del for its
tp_free, give the type PyObject_GC_Del for its tp_free (the appropriate
default for a gc'able type).

cPickle.c:  The Pickler and Unpickler types claim to be base classes
and gc'able, but their dealloc functions didn't call tp_free.
Repaired that.  Also call PyType_Ready() on these typeobjects, so
that the correct (PyObject_GC_Del) default memory-freeing function
gets plugged into these types' tp_free slots.

1 files changed, 7 insertions, 2 deletions

diff --git a/Modules/cPickle.c b/Modules/cPickle.c
index 733587e..b928e47 100644
--- a/Modules/cPickle.c
+++ b/Modules/cPickle.c
@@ -2853,7 +2853,7 @@ Pickler_dealloc(Picklerobject *self)
 	Py_XDECREF(self->inst_pers_func);
 	Py_XDECREF(self->dispatch_table);
 	PyMem_Free(self->write_buf);
-	PyObject_GC_Del(self);
+	self->ob_type->tp_free((PyObject *)self);
 }
 
 static int
@@ -5212,7 +5212,7 @@ Unpickler_dealloc(Unpicklerobject *self)
 		free(self->buf);
 	}
 
-	PyObject_GC_Del(self);
+	self->ob_type->tp_free((PyObject *)self);
 }
 
 static int
@@ -5534,6 +5534,11 @@ init_stuff(PyObject *module_dict)
 
 #define INIT_STR(S) if (!( S ## _str=PyString_InternFromString(#S)))  return -1;
 
+	if (PyType_Ready(&Unpicklertype) < 0)
+		return -1;
+	if (PyType_Ready(&Picklertype) < 0)
+		return -1;
+
 	INIT_STR(__class__);
 	INIT_STR(__getinitargs__);
 	INIT_STR(__dict__);