diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-04-19 19:34:58 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 19:34:58 (GMT) |
| commit | 64aa4df8502ca5d0a8ffb767ff97f625625c758c (patch) | |
| tree | 7f059f4e132f2b877eb93ae810189d71cff878cb /Modules/cjkcodecs/multibytecodec.c | |
| parent | 32c43fbfeeb1502d67e8fb24bb42fcd9b1cc750a (diff) | |
| download | cpython-64aa4df8502ca5d0a8ffb767ff97f625625c758c.zip cpython-64aa4df8502ca5d0a8ffb767ff97f625625c758c.tar.gz cpython-64aa4df8502ca5d0a8ffb767ff97f625625c758c.tar.bz2 | |
[2.7] bpo-30061: Check if PyObject_Size()/PySequence_Size()/PyMapping_Size() (GH-1096) (GH-1180) (#1183)
raised an error.
(cherry picked from commit bf623ae8843dc30b28c574bec8d29fc14be59d86)
(cherry picked from commit 680fea4)
Diffstat (limited to 'Modules/cjkcodecs/multibytecodec.c')
| -rw-r--r-- | Modules/cjkcodecs/multibytecodec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c index 8713628..8901b42 100644 --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -1604,6 +1604,9 @@ mbstreamwriter_writelines(MultibyteStreamWriterObject *self, PyObject *lines) if (r == -1) return NULL; } + /* PySequence_Length() can fail */ + if (PyErr_Occurred()) + return NULL; Py_RETURN_NONE; } |