diff options
| author |   Serhiy Storchaka <storchaka@gmail.com> | 2017-04-19 20:03:52 +0300 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-04-19 20:03:52 +0300 |
| commit | bf623ae8843dc30b28c574bec8d29fc14be59d86 (patch) | |
| tree | 0a7ab5b441e0306767bfbc6da4522e4af34ab9e6 /Modules/cjkcodecs | |
| parent | bpo-29925: Skip test_uuid1_safe() on OS X Tiger (#971) (diff) | |
| download | cpython-bf623ae8843dc30b28c574bec8d29fc14be59d86.tar.gz cpython-bf623ae8843dc30b28c574bec8d29fc14be59d86.tar.bz2 cpython-bf623ae8843dc30b28c574bec8d29fc14be59d86.zip | |
bpo-30061: Check if PyObject_Size()/PySequence_Size()/PyMapping_Size() (#1096)
raised an error.
Replace them with using concrete types API that never fails if appropriate.
Diffstat (limited to 'Modules/cjkcodecs')
| -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 8a67da73248..22172b043bc 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; } |