Make MultibyteCodecObject own a reference to the codec module that owns its codec memory

Author: erlend-aasland

Modules/cjkcodecs/cjkcodecs.h

@@ -289,15 +289,13 @@ destroy_codec_capsule(PyObject *capsule)
 {
     void *ptr = PyCapsule_GetPointer(capsule, CODEC_CAPSULE);
     codec_capsule *data = (codec_capsule *)ptr;
-    fprintf(stderr, "uncapsulating %s\n", data->codec->encoding);
     Py_DECREF(data->cjk_module);
     PyMem_Free(ptr);
 }
 
 static codec_capsule *
 capsulate_codec(PyObject *mod, const MultibyteCodec *codec)
 {
-    fprintf(stderr, "capsulating %s\n", codec->encoding);
     codec_capsule *data = PyMem_Malloc(sizeof(codec_capsule));
     if (data == NULL) {
         PyErr_NoMemory();

Modules/cjkcodecs/multibytecodec.c

@@ -720,9 +720,17 @@ static struct PyMethodDef multibytecodec_methods[] = {
 };
 
 static int
-multibytecodec_traverse(PyObject *self, visitproc visit, void *arg)
+multibytecodec_clear(MultibyteCodecObject *self)
+{
+    Py_CLEAR(self->cjk_module);
+    return 0;
+}
+
+static int
+multibytecodec_traverse(MultibyteCodecObject *self, visitproc visit, void *arg)
 {
     Py_VISIT(Py_TYPE(self));
+    Py_VISIT(self->cjk_module);
     return 0;
 }
 
@@ -731,6 +739,7 @@ multibytecodec_dealloc(MultibyteCodecObject *self)
 {
     PyObject_GC_UnTrack(self);
     PyTypeObject *tp = Py_TYPE(self);
+    (void)multibytecodec_clear(self);
     tp->tp_free(self);
     Py_DECREF(tp);
 }
@@ -740,6 +749,7 @@ static PyType_Slot multibytecodec_slots[] = {
     {Py_tp_getattro, PyObject_GenericGetAttr},
     {Py_tp_methods, multibytecodec_methods},
     {Py_tp_traverse, multibytecodec_traverse},
+    {Py_tp_clear, multibytecodec_clear},
     {0, NULL},
 };
 
@@ -1969,6 +1979,7 @@ _multibytecodec___create_codec(PyObject *module, PyObject *arg)
     if (self == NULL)
         return NULL;
     self->codec = codec;
+    self->cjk_module = Py_NewRef(data->cjk_module);
 
     PyObject_GC_Track(self);
     return (PyObject *)self;

Modules/cjkcodecs/multibytecodec.h

@@ -63,6 +63,7 @@ typedef struct {
 typedef struct {
     PyObject_HEAD
     MultibyteCodec *codec;
+    PyObject *cjk_module;
 } MultibyteCodecObject;
 
 #define MultibyteCodec_Check(state, op) Py_IS_TYPE((op), state->multibytecodec_type)