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
049a378cd7
commit
23a32ba0e5
|
@ -9,6 +9,8 @@ What's New in Python 2.7.4
|
|||
Core and Builtins
|
||||
-----------------
|
||||
|
||||
- Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB.
|
||||
|
||||
- Issue #15516: Fix a bug in PyString_FromFormat where it failed to properly
|
||||
ignore errors from a __int__() method.
|
||||
|
||||
|
|
|
@ -530,7 +530,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();
|
||||
|
@ -563,9 +563,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