summaryrefslogtreecommitdiffstats
path: root/Modules/cjkcodecs
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-04-19 17:03:52 (GMT)
committerGitHub <noreply@github.com>2017-04-19 17:03:52 (GMT)
commitbf623ae8843dc30b28c574bec8d29fc14be59d86 (patch)
tree0a7ab5b441e0306767bfbc6da4522e4af34ab9e6 /Modules/cjkcodecs
parentc209b70d610da50a844a3c10f37d6183bade3446 (diff)
downloadcpython-bf623ae8843dc30b28c574bec8d29fc14be59d86.zip
cpython-bf623ae8843dc30b28c574bec8d29fc14be59d86.tar.gz
cpython-bf623ae8843dc30b28c574bec8d29fc14be59d86.tar.bz2
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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 8a67da7..22172b0 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;
}