mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source 
by using 's*' instead of 't#'
This commit is contained in:
Hirokazu Yamamoto 2008-08-17 12:59:57 +00:00
parent 289d9eb10f
commit 078f0f5a6d
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -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)

9
Modules/cjkcodecs/multibytecodec.c
View file

@ -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);