Backport fix for patch #1297028, cjkcodecs does not initialize type pointer

diff --git a/Misc/NEWS b/Misc/NEWS
index b77e6dbdacebbfb7fb9d2877e42a69ca75b2a45e..3b0357d07eded5a90d213eb5d37cce0e4a2633d0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4,6 +4,30 @@ Python News
 
 (editors: check NEWS.help for information about editing NEWS using ReST.)
 
+What's New in Python 2.4.2 final?
+=================================
+
+*Release date: XX-SEP-2005*
+
+Core and builtins
+-----------------
+
+
+Extension Modules
+-----------------
+
+- Patch #1297028: fix segfault if call type on MultibyteCodec,
+  MultibyteStreamReader, or MultibyteStreamWriter.
+
+
+Tests
+-----
+
+
+Build
+-----
+
+
 What's New in Python 2.4.2c1
 ============================
 

diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 4444941bde5faf09a6e9027c673240ddff1bece8..7d2d15ebfb78e04e8be8d1f0ad0bfcf9e3e99216 100644 (file)
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -1265,6 +1265,10 @@ static struct PyMethodDef __methods[] = {
 void
 init_multibytecodec(void)
 {
+       MultibyteCodec_Type.ob_type = &PyType_Type;
+       MultibyteStreamReader_Type.ob_type = &PyType_Type;
+       MultibyteStreamWriter_Type.ob_type = &PyType_Type;
+
        Py_InitModule("_multibytecodec", __methods);
 
        if (PyErr_Occurred())