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

Rewrite IOBase.readall to avoid costly string resizes, and plug a leak

Browse source
This commit is contained in:
Antoine Pitrou 2009-03-29 19:19:49 +00:00
parent 7d037a7b52
commit 00a9b73817
2 changed files with 21 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Modules/_bufferedio.c
View file

@ -1144,7 +1144,6 @@ _BufferedReader_read_unlocked(BufferedObject *self, Py_ssize_t n)
PyObject *data, *res = NULL;
Py_ssize_t current_size, remaining, written;
char *out;
static PyObject *sep = NULL;
/* Special case for when the number of bytes to read is unspecified. */
if (n == -1) {
@ -1201,15 +1200,7 @@ _BufferedReader_read_unlocked(BufferedObject *self, Py_ssize_t n)
return data;
}
else {
if (sep == NULL) {
sep = PyBytes_FromStringAndSize(NULL, 0);
if (sep == NULL) {
Py_DECREF(data);
Py_DECREF(chunks);
return NULL;
}
}
res =_PyBytes_Join(sep, chunks);
res = _PyBytes_Join(_PyIO_empty_bytes, chunks);
Py_DECREF(data);
Py_DECREF(chunks);
return res;

48
Modules/_iobase.c
View file

@ -809,49 +809,41 @@ PyDoc_STRVAR(RawIOBase_readall_doc,
static PyObject *
RawIOBase_readall(PyObject *self, PyObject *args)
{
PyObject *b = NULL;
Py_ssize_t cursize = 0;
int r;
PyObject *chunks = PyList_New(0);
PyObject *result;
if (chunks == NULL)
return NULL;
while (1) {
Py_ssize_t length;
PyObject *data = PyObject_CallMethod(self, "read",
"i", DEFAULT_BUFFER_SIZE);
if (!data) {
Py_XDECREF(b);
Py_DECREF(chunks);
return NULL;
}
if (!PyBytes_Check(data)) {
Py_XDECREF(b);
Py_DECREF(chunks);
Py_DECREF(data);
PyErr_SetString(PyExc_TypeError, "read() should return bytes");
return NULL;
}
length = Py_SIZE(data);
if (b == NULL)
b = data;
else if (length != 0) {
_PyBytes_Resize(&b, cursize + length);
if (b == NULL) {
Py_DECREF(data);
return NULL;
}
memcpy(PyBytes_AS_STRING(b) + cursize,
PyBytes_AS_STRING(data), length);
if (PyBytes_GET_SIZE(data) == 0) {
/* EOF */
Py_DECREF(data);
}
if (length == 0)
break;
}
r = PyList_Append(chunks, data);
Py_DECREF(data);
if (r < 0) {
Py_DECREF(chunks);
return NULL;
}
}
return b;
result = _PyBytes_Join(_PyIO_empty_bytes, chunks);
Py_DECREF(chunks);
return result;
}
static PyMethodDef RawIOBase_methods[] = {