commit 680fea4067537a9b9c79aadd44a3a19e83cd2dbf
author Serhiy Storchaka <storchaka@gmail.com> Wed Apr 19 21:22:49 2017 +0300
committer GitHub <noreply@github.com> Wed Apr 19 21:22:49 2017 +0300
tree baf7cb3259f1b27e82d5166e5a88fd4e0f557ea4
parent 8e5b52a8da07e781bda50ba0a7065b1058495a37

bpo-30061: Check if PyObject_Size()/PySequence_Size()/PyMapping_Size() (#1096) (#1180)

raised an error.

(cherry picked from commit bf623ae8843dc30b28c574bec8d29fc14be59d86)

Modules/cjkcodecs/multibytecodec.c

diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index d1da189..d6efc77 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;
 }