Kaydet (Commit) e6edec23 authored tarafından Victor Stinner's avatar Victor Stinner

Issue #9015, #9611: FileIO.readinto(), FileIO.write() and os.write() clamp the

length to 2^31-1 on Windows.
üst 560f9dab
...@@ -8,6 +8,9 @@ What's New in Python 3.2 Release Candidate 1 ...@@ -8,6 +8,9 @@ What's New in Python 3.2 Release Candidate 1
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #9015, #9611: FileIO.readinto(), FileIO.write() and os.write() clamp
the length to 2^31-1 on Windows.
- Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime() - Issue #8278: On Windows and with a NTFS filesystem, os.stat() and os.utime()
can now handle dates after 2038. can now handle dates after 2038.
......
...@@ -506,7 +506,7 @@ static PyObject * ...@@ -506,7 +506,7 @@ static PyObject *
fileio_readinto(fileio *self, PyObject *args) fileio_readinto(fileio *self, PyObject *args)
{ {
Py_buffer pbuf; Py_buffer pbuf;
Py_ssize_t n; Py_ssize_t n, len;
if (self->fd < 0) if (self->fd < 0)
return err_closed(); return err_closed();
...@@ -517,9 +517,16 @@ fileio_readinto(fileio *self, PyObject *args) ...@@ -517,9 +517,16 @@ fileio_readinto(fileio *self, PyObject *args)
return NULL; return NULL;
if (_PyVerify_fd(self->fd)) { if (_PyVerify_fd(self->fd)) {
len = pbuf.len;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
errno = 0; errno = 0;
n = read(self->fd, pbuf.buf, pbuf.len); #if defined(MS_WIN64) || defined(MS_WINDOWS)
if (len > INT_MAX)
len = INT_MAX;
n = read(self->fd, pbuf.buf, (int)len);
#else
n = read(self->fd, pbuf.buf, (size_t)len);
#endif
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
} else } else
n = -1; n = -1;
...@@ -685,7 +692,7 @@ static PyObject * ...@@ -685,7 +692,7 @@ static PyObject *
fileio_write(fileio *self, PyObject *args) fileio_write(fileio *self, PyObject *args)
{ {
Py_buffer pbuf; Py_buffer pbuf;
Py_ssize_t n; Py_ssize_t n, len;
if (self->fd < 0) if (self->fd < 0)
return err_closed(); return err_closed();
...@@ -698,7 +705,14 @@ fileio_write(fileio *self, PyObject *args) ...@@ -698,7 +705,14 @@ fileio_write(fileio *self, PyObject *args)
if (_PyVerify_fd(self->fd)) { if (_PyVerify_fd(self->fd)) {
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
errno = 0; errno = 0;
n = write(self->fd, pbuf.buf, pbuf.len); len = pbuf.len;
#if defined(MS_WIN64) || defined(MS_WINDOWS)
if (len > INT_MAX)
len = INT_MAX;
n = write(self->fd, pbuf.buf, (int)len);
#else
n = write(self->fd, pbuf.buf, (size_t)len);
#endif
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
} else } else
n = -1; n = -1;
......
...@@ -5696,7 +5696,7 @@ posix_write(PyObject *self, PyObject *args) ...@@ -5696,7 +5696,7 @@ posix_write(PyObject *self, PyObject *args)
{ {
Py_buffer pbuf; Py_buffer pbuf;
int fd; int fd;
Py_ssize_t size; Py_ssize_t size, len;
if (!PyArg_ParseTuple(args, "iy*:write", &fd, &pbuf)) if (!PyArg_ParseTuple(args, "iy*:write", &fd, &pbuf))
return NULL; return NULL;
...@@ -5704,8 +5704,15 @@ posix_write(PyObject *self, PyObject *args) ...@@ -5704,8 +5704,15 @@ posix_write(PyObject *self, PyObject *args)
PyBuffer_Release(&pbuf); PyBuffer_Release(&pbuf);
return posix_error(); return posix_error();
} }
len = pbuf.len;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
size = write(fd, pbuf.buf, (size_t)pbuf.len); #if defined(MS_WIN64) || defined(MS_WINDOWS)
if (len > INT_MAX)
len = INT_MAX;
size = write(fd, pbuf.buf, (int)len);
#else
size = write(fd, pbuf.buf, (size_t)len);
#endif
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
PyBuffer_Release(&pbuf); PyBuffer_Release(&pbuf);
if (size < 0) if (size < 0)
......
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