MultibyteCodec_Encode() checks if PyUnicode_AS_UNICODE() failed

e94fd70b · Victor Stinner · ca8cc12c · e94fd70b
Commit e94fd70b authored Nov 21, 2011 by Victor Stinner
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

Modules/cjkcodecs/multibytecodec.c Modules/cjkcodecs/multibytecodec.c +5 -2

No files found.
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -574,8 +574,11 @@ MultibyteCodec_Encode(MultibyteCodecObject *self,
        }
    }
-    data = PyUnicode_AS_UNICODE(arg);
+    data = PyUnicode_AsUnicodeAndSize(arg, &datalen);
-    datalen = PyUnicode_GET_SIZE(arg);
+    if (data == NULL) {
+        Py_XDECREF(ucvt);
+        return NULL;
+    }
    errorcb = internal_error_callback(errors);
    if (errorcb == NULL) {