From c44057dfbdb4e4f651e7cc4761aa63b7e8d128c3 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 3 Jan 2013 03:33:21 +0100 Subject: Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB --- Misc/NEWS | 2 ++ Modules/_io/fileio.c | 13 +++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index fdd372d..fdb6fa8 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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 diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index 605ad51..8ea7c58 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -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, + (int)n); +#else n = read(self->fd, PyBytes_AS_STRING(result) + total, - newsize - total); + n); +#endif Py_END_ALLOW_THREADS if (n == 0) break; -- cgit v0.12