From e6a1cb97000a566338fd484cbb0e7aa2e95185d8 Mon Sep 17 00:00:00 2001 From: Hye-Shik Chang Date: Fri, 23 Jun 2006 21:16:18 +0000 Subject: Bug #1511381: codec_getstreamcodec() in codec.c is corrected to omit a default "error" argument for NULL pointer. This allows the parser to take a codec from cjkcodecs again. (Reported by Taewook Kang and reviewed by Walter Doerwald) --- Misc/NEWS | 3 +++ Python/codecs.c | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index ae1963f..76acf30 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -12,6 +12,9 @@ What's New in Python 2.5 beta 2? Core and builtins ----------------- +- Bug #1511381: codec_getstreamcodec() in codec.c is corrected to + omit a default "error" argument for NULL pointer. This allows + the parser to take a codec from cjkcodecs again. Library ------- diff --git a/Python/codecs.c b/Python/codecs.c index 046abe3..4b0f4cb 100644 --- a/Python/codecs.c +++ b/Python/codecs.c @@ -249,14 +249,17 @@ PyObject *codec_getstreamcodec(const char *encoding, const char *errors, const int index) { - PyObject *codecs, *streamcodec; + PyObject *codecs, *streamcodec, *codeccls; codecs = _PyCodec_Lookup(encoding); if (codecs == NULL) return NULL; - streamcodec = PyEval_CallFunction( - PyTuple_GET_ITEM(codecs, index), "Os", stream, errors); + codeccls = PyTuple_GET_ITEM(codecs, index); + if (errors != NULL) + streamcodec = PyObject_CallFunction(codeccls, "Os", stream, errors); + else + streamcodec = PyObject_CallFunction(codeccls, "O", stream); Py_DECREF(codecs); return streamcodec; } -- cgit v0.12