diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2017-04-19 21:22:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-19 21:22:49 +0300 |
| commit | 680fea4067537a9b9c79aadd44a3a19e83cd2dbf (patch) | |
| tree | baf7cb3259f1b27e82d5166e5a88fd4e0f557ea4 /Modules/cjkcodecs/multibytecodec.c | |
| parent | 8e5b52a8da07e781bda50ba0a7065b1058495a37 (diff) | |
| download | cpython-git-680fea4067537a9b9c79aadd44a3a19e83cd2dbf.tar.gz | |
bpo-30061: Check if PyObject_Size()/PySequence_Size()/PyMapping_Size() (#1096) (#1180)
raised an error.
(cherry picked from commit bf623ae8843dc30b28c574bec8d29fc14be59d86)
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 d1da189ddd..d6efc77d20 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; } |