mirror of https://github.com/python/cpython
This commit is contained in:
parent
bb4a747b69
commit
c655a726db
|
@ -10,6 +10,8 @@ What's New in Python 3.2.2?
|
|||
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
|
||||
generator.
|
||||
|
||||
|
@ -908,7 +910,7 @@ Core and Builtins
|
|||
(length bigger than 2^31-1 bytes).
|
||||
|
||||
- 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()
|
||||
can now handle dates after 2038.
|
||||
|
|
|
@ -664,6 +664,10 @@ fileio_read(fileio *self, PyObject *args)
|
|||
return fileio_readall(self);
|
||||
}
|
||||
|
||||
#if defined(MS_WIN64) || defined(MS_WINDOWS)
|
||||
if (size > INT_MAX)
|
||||
size = INT_MAX;
|
||||
#endif
|
||||
bytes = PyBytes_FromStringAndSize(NULL, size);
|
||||
if (bytes == NULL)
|
||||
return NULL;
|
||||
|
@ -672,7 +676,11 @@ fileio_read(fileio *self, PyObject *args)
|
|||
if (_PyVerify_fd(self->fd)) {
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
errno = 0;
|
||||
#if defined(MS_WIN64) || defined(MS_WINDOWS)
|
||||
n = read(self->fd, ptr, (int)size);
|
||||
#else
|
||||
n = read(self->fd, ptr, size);
|
||||
#endif
|
||||
Py_END_ALLOW_THREADS
|
||||
} else
|
||||
n = -1;
|
||||
|
|
Loading…
Reference in New Issue