commit 9a80faba886ab081e7ccb30440f3c8e158738bab
author Victor Stinner <victor.stinner@haypocalc.com> Mon Nov 21 02:50:14 2011 +0100
committer Victor Stinner <victor.stinner@haypocalc.com> Mon Nov 21 02:50:14 2011 +0100
tree fbecf7b38420d98d12ebe351bb74d0a70d06f0f8
parent 9e30aa52fd416e17b692c4f22e57191cdd6ec654

MultibyteCodec_Encode() checks if PyUnicode_AS_UNICODE() failed

Modules/cjkcodecs/multibytecodec.c

diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 77edbb3..6b23523 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -574,8 +574,11 @@
         }
     }
 
-    data = PyUnicode_AS_UNICODE(arg);
-    datalen = PyUnicode_GET_SIZE(arg);
+    data = PyUnicode_AsUnicodeAndSize(arg, &datalen);
+    if (data == NULL) {
+        Py_XDECREF(ucvt);
+        return NULL;
+    }
 
     errorcb = internal_error_callback(errors);
     if (errorcb == NULL) {