mirror of https://github.com/python/cpython
Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB
This commit is contained in:
parent
549d465fe2
commit
c44057dfbd
|
@ -10,6 +10,8 @@ What's New in Python 3.2.4
|
|||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB.
|
||||
|
||||
- Issue #16455: On FreeBSD and Solaris, if the locale is C, the
|
||||
ASCII/surrogateescape codec is now used, instead of the locale encoding, to
|
||||
decode the command line arguments. This change fixes inconsistencies with
|
||||
|
|
|
@ -558,7 +558,7 @@ fileio_readall(fileio *self)
|
|||
{
|
||||
PyObject *result;
|
||||
Py_ssize_t total = 0;
|
||||
int n;
|
||||
Py_ssize_t n;
|
||||
|
||||
if (self->fd < 0)
|
||||
return err_closed();
|
||||
|
@ -591,9 +591,18 @@ fileio_readall(fileio *self)
|
|||
}
|
||||
Py_BEGIN_ALLOW_THREADS
|
||||
errno = 0;
|
||||
n = newsize - total;
|
||||
#if defined(MS_WIN64) || defined(MS_WINDOWS)
|
||||
if (n > INT_MAX)
|
||||
n = INT_MAX;
|
||||
n = read(self->fd,
|
||||
PyBytes_AS_STRING(result) + total,
|
||||
newsize - total);
|
||||
(int)n);
|
||||
#else
|
||||
n = read(self->fd,
|
||||
PyBytes_AS_STRING(result) + total,
|
||||
n);
|
||||
#endif
|
||||
Py_END_ALLOW_THREADS
|
||||
if (n == 0)
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue