mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 11:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #17693: Fix memory/reference leaks

Browse source
This commit is contained in:
Victor Stinner 2013-04-14 18:11:41 +02:00
parent bf71f7d654
commit 322cc7438c
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Modules/cjkcodecs/multibytecodec.c
View file

@ -738,7 +738,6 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
PyObject *inbuf = NULL; PyObject *inbuf = NULL;
Py_ssize_t inpos, datalen; Py_ssize_t inpos, datalen;
PyObject *origpending = NULL; PyObject *origpending = NULL;
wchar_t *data;
if (PyUnicode_Check(unistr)) if (PyUnicode_Check(unistr))
ucvt = NULL; ucvt = NULL;
@ -754,10 +753,6 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
} }
} }
data = PyUnicode_AsUnicodeAndSize(unistr, &datalen);
if (data == NULL)
goto errorexit;
if (ctx->pending) { if (ctx->pending) {
PyObject *inbuf_tmp; PyObject *inbuf_tmp;
@ -793,6 +788,7 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
origpending = NULL; origpending = NULL;
goto errorexit; goto errorexit;
} }
Py_XDECREF(origpending);
if (inpos < datalen) { if (inpos < datalen) {
if (datalen - inpos > MAXENCPENDING) { if (datalen - inpos > MAXENCPENDING) {
@ -808,6 +804,7 @@ encoder_encode_stateful(MultibyteStatefulEncoderContext *ctx,
} }
} }
Py_DECREF(inbuf);
Py_XDECREF(ucvt); Py_XDECREF(ucvt);
return r; return r;
@ -815,6 +812,7 @@ errorexit:
Py_XDECREF(r); Py_XDECREF(r);
Py_XDECREF(ucvt); Py_XDECREF(ucvt);
Py_XDECREF(origpending); Py_XDECREF(origpending);
Py_XDECREF(inbuf);
return NULL; return NULL;
} }