traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Merge 3.2) Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB.

This commit is contained in:
Victor Stinner 2013-01-03 03:37:47 +01:00
parent 269b3ce400 c44057dfbd
commit 6f84659e5e
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -12,6 +12,8 @@ What's New in Python 3.3.1?
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

13
Modules/_io/fileio.c
View File

@ -607,7 +607,7 @@ fileio_readall(fileio *self)
#endif
PyObject *result;
Py_ssize_t total = 0;
int n;
Py_ssize_t n;
size_t newsize;
if (self->fd < 0)
@ -656,9 +656,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;