mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 08:02:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

CJK codecs checks for conversion to Py_UNICODE* failures

Browse source
This commit is contained in:
Victor Stinner 2011-11-21 03:01:27 +01:00
parent 9a80faba88
commit 4eea849469
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/cjkcodecs/multibytecodec.c
View file

@ -443,10 +443,12 @@ multibytecodec_decerror(MultibyteCodec *codec,
goto errorexit; goto errorexit;
} }
if (PyUnicode_AsUnicode(retuni) == NULL)
goto errorexit;
retunisize = PyUnicode_GET_SIZE(retuni); retunisize = PyUnicode_GET_SIZE(retuni);
if (retunisize > 0) { if (retunisize > 0) {
REQUIRE_DECODEBUFFER(buf, retunisize); REQUIRE_DECODEBUFFER(buf, retunisize);
memcpy((char *)buf->outbuf, PyUnicode_AS_DATA(retuni), memcpy((char *)buf->outbuf, PyUnicode_AS_UNICODE(retuni),
retunisize * Py_UNICODE_SIZE); retunisize * Py_UNICODE_SIZE);
buf->outbuf += retunisize; buf->outbuf += retunisize;
} }
@ -746,6 +748,7 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
PyObject *ucvt, *r = NULL; PyObject *ucvt, *r = NULL;
Py_UNICODE *inbuf, *inbuf_end, *inbuf_tmp = NULL; Py_UNICODE *inbuf, *inbuf_end, *inbuf_tmp = NULL;
Py_ssize_t datalen, origpending; Py_ssize_t datalen, origpending;
wchar_t *data;
if (PyUnicode_Check(unistr)) if (PyUnicode_Check(unistr))
ucvt = NULL; ucvt = NULL;
@ -761,7 +764,9 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
} }
} }
datalen = PyUnicode_GET_SIZE(unistr); data = PyUnicode_AsUnicodeAndSize(unistr, &datalen);
if (data == NULL)
goto errorexit;
origpending = ctx->pendingsize; origpending = ctx->pendingsize;
if (origpending > 0) { if (origpending > 0) {
@ -852,7 +857,9 @@ decoder_prepare_buffer(MultibyteDecodeBuffer *buf, const char *data,
buf->outobj = PyUnicode_FromUnicode(NULL, size); buf->outobj = PyUnicode_FromUnicode(NULL, size);
if (buf->outobj == NULL) if (buf->outobj == NULL)
return -1; return -1;
buf->outbuf = PyUnicode_AS_UNICODE(buf->outobj); buf->outbuf = PyUnicode_AsUnicode(buf->outobj);
if (buf->outbuf == NULL)
return -1;
buf->outbuf_end = buf->outbuf + buf->outbuf_end = buf->outbuf +
PyUnicode_GET_SIZE(buf->outobj); PyUnicode_GET_SIZE(buf->outobj);
} }