commit bf623ae8843dc30b28c574bec8d29fc14be59d86
author Serhiy Storchaka <storchaka@gmail.com> Wed Apr 19 20:03:52 2017 +0300
committer GitHub <noreply@github.com> Wed Apr 19 20:03:52 2017 +0300
tree 0a7ab5b441e0306767bfbc6da4522e4af34ab9e6
parent c209b70d610da50a844a3c10f37d6183bade3446

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.

Modules/cjkcodecs/multibytecodec.c

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 @@
         if (r == -1)
             return NULL;
     }
+    /* PySequence_Length() can fail */
+    if (PyErr_Occurred())
+        return NULL;
 
     Py_RETURN_NONE;
 }