Issue #5640: Fix Shift-JIS incremental encoder for error handlers different

than strict

3 files changed, 8 insertions, 1 deletions

diff --git a/Lib/test/test_multibytecodec.py b/Lib/test/test_multibytecodec.py
index 517a682..95ca0ab 100644
--- a/Lib/test/test_multibytecodec.py
+++ b/Lib/test/test_multibytecodec.py
@@ -107,6 +107,10 @@ class Test_IncrementalEncoder(unittest.TestCase):
         self.assertRaises(UnicodeEncodeError, encoder.encode, u'\u0123')
         self.assertEqual(encoder.encode(u'', True), '\xa9\xdc')
 
+    def test_issue5640(self):
+        encoder = codecs.getincrementalencoder('shift-jis')('backslashreplace')
+        self.assertEqual(encoder.encode(u'\xff'), b'\\xff')
+        self.assertEqual(encoder.encode(u'\n'), b'\n')
 
 class Test_IncrementalDecoder(unittest.TestCase):
 
diff --git a/Misc/NEWS b/Misc/NEWS
index c5bb1e8..3656def 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,9 @@ C-API
 Library
 -------
 
+- Issue #5640: Fix Shift-JIS incremental encoder for error handlers different
+  than strict
+
 - Issue #8782: Add a trailing newline in linecache.updatecache to the last line
   of files without one.
 
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 56251f3..1f31595 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -498,7 +498,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))
@@ -528,6 +527,7 @@ multibytecodec_encode(MultibyteCodec *codec,
         if (_PyString_Resize(&buf.outobj, finalsize) == -1)
             goto errorexit;
 
+	*data = buf.inbuf;
     Py_XDECREF(buf.excobj);
     return buf.outobj;