diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-07-16 22:20:19 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-07-16 22:20:19 +0200 |
| commit | 8cc80f1d8199a29a432c8caeb3142f9aa35012fd (patch) | |
| tree | 7909c2e728f6cb5edd9b6e971f21df5946981288 | |
| parent | a3626bc5bddf9bf43f33060f4ea1a99f25e0c7f1 (diff) | |
| parent | 579db160b392404b6dd9608ce5f5bef29a9885a4 (diff) | |
| download | cpython-git-8cc80f1d8199a29a432c8caeb3142f9aa35012fd.tar.gz | |
Merge 3.4
| -rw-r--r-- | Lib/test/multibytecodec_support.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/cjkcodecs/multibytecodec.c | 3 |
3 files changed, 12 insertions, 0 deletions
diff --git a/Lib/test/multibytecodec_support.py b/Lib/test/multibytecodec_support.py index bc1cfc8518..f9884c68eb 100644 --- a/Lib/test/multibytecodec_support.py +++ b/Lib/test/multibytecodec_support.py @@ -270,6 +270,13 @@ class TestBase: 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 = [] @@ -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 index c0515141c9..e4547f75c9 100644 --- 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); |