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

bpo-30068: add missing iter(self) in _io._IOBase.readlines when hint is present (#1130)

Browse source
This commit is contained in:
Xiang Zhang 2017-04-15 12:47:28 +08:00 • committed by GitHub
parent eaeda64c2f
commit 026435ce49
3 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Modules/_io/iobase.c
View file

@ -643,7 +643,7 @@ _io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint)
/*[clinic end generated code: output=2f50421677fa3dea input=9400c786ea9dc416]*/
{
Py_ssize_t length = 0;
PyObject *result;
PyObject *result, *it = NULL;
result = PyList_New(0);
if (result == NULL)
@ -658,19 +658,22 @@ _io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint)
self, NULL);
if (ret == NULL) {
Py_DECREF(result);
return NULL;
goto error;
}
Py_DECREF(ret);
return result;
}
it = PyObject_GetIter(self);
if (it == NULL) {
goto error;
}
while (1) {
PyObject *line = PyIter_Next(self);
PyObject *line = PyIter_Next(it);
if (line == NULL) {
if (PyErr_Occurred()) {
Py_DECREF(result);
return NULL;
goto error;
}
else
break; /* StopIteration raised */
@ -678,8 +681,7 @@ _io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint)
if (PyList_Append(result, line) < 0) {
Py_DECREF(line);
Py_DECREF(result);
return NULL;
goto error;
}
length += PyObject_Size(line);
Py_DECREF(line);
@ -687,7 +689,14 @@ _io__IOBase_readlines_impl(PyObject *self, Py_ssize_t hint)
if (length > hint)
break;
}
Py_DECREF(it);
return result;
error:
Py_XDECREF(it);
Py_DECREF(result);
return NULL;
}
/*[clinic input]