From 23a32ba0e5afcee7184408cf9415f038e864df96 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 3 Jan 2013 03:33:21 +0100 Subject: [PATCH] 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 224e45667aa..097f205a102 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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. diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c index 54116656012..7fe245491bb 100644 --- a/Modules/_io/fileio.c +++ b/Modules/_io/fileio.c @@ -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;