diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-04-19 19:09:56 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 19:09:56 (GMT) |
| commit | e63af29c87b44bb7ada5783cd0ff6ee6d4f9c17c (patch) | |
| tree | 4397f11f7bce21bf7e5be3dd8185eb5bf2d78c87 /Modules/cjkcodecs/multibytecodec.c | |
| parent | 49a905958ffc2fcd5d1d1a293ae453d45deeb884 (diff) | |
| download | cpython-e63af29c87b44bb7ada5783cd0ff6ee6d4f9c17c.zip cpython-e63af29c87b44bb7ada5783cd0ff6ee6d4f9c17c.tar.gz cpython-e63af29c87b44bb7ada5783cd0ff6ee6d4f9c17c.tar.bz2 | |
[3.5] bpo-30061: Check if PyObject_Size()/PySequence_Size()/PyMapping_Size() (GH-1096) (GH-1180) (#1182)
raised an error.
(cherry picked from commit bf623ae8843dc30b28c574bec8d29fc14be59d86)
(cherry picked from commit 680fea4067537a9b9c79aadd44a3a19e83cd2dbf)
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 f5c8421..61750ed 100644 --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -1670,6 +1670,9 @@ _multibytecodec_MultibyteStreamWriter_writelines(MultibyteStreamWriterObject *se if (r == -1) return NULL; } + /* PySequence_Length() can fail */ + if (PyErr_Occurred()) + return NULL; Py_RETURN_NONE; } |