Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #9611, #9015: FileIO.read() clamps the length to INT_MAX on Windows.

This commit is contained in:
Victor Stinner 2011-07-05 11:31:49 +02:00
parent bb4a747b69
commit c655a726db
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -10,6 +10,8 @@ What's New in Python 3.2.2?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #9611, #9015: FileIO.read() clamps the length to INT_MAX on Windows.
- When a generator yields, do not retain the caller's exception state on the - When a generator yields, do not retain the caller's exception state on the
generator. generator.
@ -908,7 +910,7 @@ Core and Builtins
(length bigger than 2^31-1 bytes). (length bigger than 2^31-1 bytes).
- Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and - Issue #9015, #9611: FileIO.readinto(), FileIO.write(), os.write() and
stdprinter.write() clamp the length to 2^31-1 on Windows. stdprinter.write() clamp the length to INT_MAX 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.

8
Modules/_io/fileio.c
View File

@ -664,6 +664,10 @@ fileio_read(fileio *self, PyObject *args)
return fileio_readall(self); return fileio_readall(self);
} }
#if defined(MS_WIN64) || defined(MS_WINDOWS)
if (size > INT_MAX)
size = INT_MAX;
#endif
bytes = PyBytes_FromStringAndSize(NULL, size); bytes = PyBytes_FromStringAndSize(NULL, size);
if (bytes == NULL) if (bytes == NULL)
return NULL; return NULL;
@ -672,7 +676,11 @@ fileio_read(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;
#if defined(MS_WIN64) || defined(MS_WINDOWS)
n = read(self->fd, ptr, (int)size);
#else
n = read(self->fd, ptr, size); n = read(self->fd, ptr, size);
#endif
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
} else } else
n = -1; n = -1;