From 944820b044ce3944dcef1b514e075118f6872942 Mon Sep 17 00:00:00 2001 From: Hye-Shik Chang Date: Thu, 2 Apr 2009 10:33:16 +0000 Subject: Issue #5640: Fix _multibytecodec so that CJK codecs don't repeat error replacement returned by codec error callbacks twice in IncrementalEncoder and StreamWriter. --- Modules/cjkcodecs/multibytecodec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Modules/cjkcodecs/multibytecodec.c') diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c index 9846465edc..c6b3492e51 100644 --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -506,7 +506,6 @@ multibytecodec_encode(MultibyteCodec *codec, outleft = (Py_ssize_t)(buf.outbuf_end - buf.outbuf); r = codec->encode(state, codec->config, &buf.inbuf, inleft, &buf.outbuf, outleft, flags); - *data = buf.inbuf; if ((r == 0) || (r == MBERR_TOOFEW && !(flags & MBENC_FLUSH))) break; else if (multibytecodec_encerror(codec, state, &buf, errors,r)) @@ -536,6 +535,7 @@ multibytecodec_encode(MultibyteCodec *codec, if (_PyBytes_Resize(&buf.outobj, finalsize) == -1) goto errorexit; + *data = buf.inbuf; Py_XDECREF(buf.excobj); return buf.outobj; -- cgit v1.2.1