From: Neal Norwitz <nnorwitz@gmail.com>
Date: Fri, 23 Sep 2005 03:23:46 +0000 (+0000)
Subject: Backport fix for patch #1297028, cjkcodecs does not initialize type pointer
X-Git-Tag: v2.4.2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ef6fb3dc52e9108f3662b411c307ff583a47c412;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Misc/NEWS b/Misc/NEWS
index b77e6dbdaceb..3b0357d07ede 100644
--- 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 4444941bde5f..7d2d15ebfb78 100644
--- 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())