commit 64aa4df8502ca5d0a8ffb767ff97f625625c758c
author Serhiy Storchaka <storchaka@gmail.com> Wed Apr 19 22:34:58 2017 +0300
committer GitHub <noreply@github.com> Wed Apr 19 22:34:58 2017 +0300
tree 7f059f4e132f2b877eb93ae810189d71cff878cb
parent 32c43fbfeeb1502d67e8fb24bb42fcd9b1cc750a

[2.7] bpo-30061: Check if PyObject_Size()/PySequence_Size()/PyMapping_Size() (GH-1096) (GH-1180) (#1183)

raised an error.

(cherry picked from commit bf623ae8843dc30b28c574bec8d29fc14be59d86)
(cherry picked from commit 680fea4)

Modules/cjkcodecs/multibytecodec.c

diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 8713628..8901b42 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -1604,6 +1604,9 @@
         if (r == -1)
             return NULL;
     }
+    /* PySequence_Length() can fail */
+    if (PyErr_Occurred())
+        return NULL;
 
     Py_RETURN_NONE;
 }