Commit e090fd78 authored by Hirokazu Yamamoto's avatar Hirokazu Yamamoto

Issue #3575: Incremental decoder's decode function now takes bytearray

by using 's*' instead of 't#'
parent 95d01ac5
......@@ -30,6 +30,9 @@ Core and Builtins
Library
-------
- Issue #3575: Incremental decoder's decode function now takes bytearray
by using 's*' instead of 't#'.
- Issue #2222: Fixed reference leak when occured os.rename()
fails unicode conversion on 2nd parameter. (windows only)
......
......@@ -1034,12 +1034,15 @@ mbidecoder_decode(MultibyteIncrementalDecoderObject *self,
{
MultibyteDecodeBuffer buf;
char *data, *wdata = NULL;
Py_buffer pdata;
Py_ssize_t wsize, finalsize = 0, size, origpending;
int final = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "t#|i:decode",
incrementalkwarglist, &data, &size, &final))
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s*|i:decode",
incrementalkwarglist, &pdata, &final))
return NULL;
data = pdata.buf;
size = pdata.len;
buf.outobj = buf.excobj = NULL;
origpending = self->pendingsize;
......@@ -1088,12 +1091,14 @@ mbidecoder_decode(MultibyteIncrementalDecoderObject *self,
if (PyUnicode_Resize(&buf.outobj, finalsize) == -1)
goto errorexit;
PyBuffer_Release(&pdata);
if (wdata != data)
PyMem_Del(wdata);
Py_XDECREF(buf.excobj);
return buf.outobj;
errorexit:
PyBuffer_Release(&pdata);
if (wdata != NULL && wdata != data)
PyMem_Del(wdata);
Py_XDECREF(buf.excobj);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment