From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 1 Dec 2011 02:18:30 +0000 (+0100)
Subject: MultibyteCodec_Decode() catchs PyUnicode_AS_UNICODE() failures
X-Git-Tag: v3.3.0a1~703
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08b523a194a066e1e758e12594d8e423b57460a9;p=python

MultibyteCodec_Decode() catchs PyUnicode_AS_UNICODE() failures
---

diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 1d6db9545e..ded9188f07 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -643,6 +643,8 @@ MultibyteCodec_Decode(MultibyteCodecObject *self,
     if (buf.outobj == NULL)
         goto errorexit;
     buf.outbuf = PyUnicode_AS_UNICODE(buf.outobj);
+    if (buf.outbuf == NULL)
+        goto errorexit;
     buf.outbuf_end = buf.outbuf + PyUnicode_GET_SIZE(buf.outobj);
 
     if (self->codec->decinit != NULL &&