Merge 3.4

vstinner · vstinner · commit 8cc80f1d8199 · 2015-07-16T22:20:19.000+02:00
diff --git a/Lib/test/multibytecodec_support.py b/Lib/test/multibytecodec_support.py
@@ -270,6 +270,13 @@ def test_streamwriter(self):
 
                 self.assertEqual(ostream.getvalue(), self.tstring[0])
 
+    def test_streamwriter_reset_no_pending(self):
+        # Issue #23247: Calling reset() on a fresh StreamWriter instance
+        # (without pending data) must not crash
+        stream = BytesIO()
+        writer = self.writer(stream)
+        writer.reset()
+
 
 class TestBase_Mapping(unittest.TestCase):
     pass_enctest = []
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -169,6 +169,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #23247: Fix a crash in the StreamWriter.reset() of CJK codecs.
+
 - Issue #24270: Add math.isclose() and cmath.isclose() functions as per PEP 485.
   Contributed by Chris Barker and Tal Einat.
 
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
@@ -1685,6 +1685,9 @@ _multibytecodec_MultibyteStreamWriter_reset_impl(MultibyteStreamWriterObject *se
 {
     PyObject *pwrt;
 
+    if (!self->pending)
+        Py_RETURN_NONE;
+
     pwrt = multibytecodec_encode(self->codec, &self->state,
                     self->pending, NULL, self->errors,
                     MBENC_FLUSH | MBENC_RESET);

Original file line number	Diff line number	Diff line change
`@@ -1685,6 +1685,9 @@ _multibytecodec_MultibyteStreamWriter_reset_impl(MultibyteStreamWriterObject *se`
`1685`	`1685`	`{`
`1686`	`1686`	`PyObject *pwrt;`
`1687`	`1687`
	`1688`	`+ if (!self->pending)`
	`1689`	`+ Py_RETURN_NONE;`
	`1690`	`+`
`1688`	`1691`	`pwrt = multibytecodec_encode(self->codec, &self->state,`
`1689`	`1692`	`self->pending, NULL, self->errors,`
`1690`	`1693`	`MBENC_FLUSH \| MBENC_RESET);`