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

Merged revisions 86587 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86587 | benjamin.peterson | 2010-11-20 11:24:04 -0600 (Sat, 20 Nov 2010) | 1 line

  correct logic when pos is after the string #10467
........
This commit is contained in:
Benjamin Peterson 2010-11-20 17:31:08 +00:00
parent a731bf1717
commit 4fec9ce601
3 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Modules/_io/bytesio.c
View file

@ -391,7 +391,7 @@ static PyObject *
bytesio_readinto(bytesio *self, PyObject *args)
{
Py_buffer buf;
Py_ssize_t len;
Py_ssize_t len, n;
CHECK_CLOSED(self);
@ -399,8 +399,13 @@ bytesio_readinto(bytesio *self, PyObject *args)
return NULL;
len = buf.len;
if (self->pos + len > self->string_size)
len = self->string_size - self->pos;
/* adjust invalid sizes */
n = self->string_size - self->pos;
if (len > n) {
len = n;
if (len < 0)
len = 0;
}
memcpy(buf.buf, self->buf + self->pos, len);
assert(self->pos + len < PY_SSIZE_T_MAX);