[Python-checkins] cpython (2.7): Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB
victor.stinner
python-checkins at python.org
Thu Jan 3 03:42:59 CET 2013
http://hg.python.org/cpython/rev/f26c91bf61bf
changeset: 81269:f26c91bf61bf
branch: 2.7
parent: 81263:7cf4ea64f603
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Jan 03 03:33:21 2013 +0100
summary:
Issue #16367: Fix FileIO.readall() on Windows for files larger than 2 GB
files:
Misc/NEWS | 2 ++
Modules/_io/fileio.c | 13 +++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -9,6 +9,8 @@
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
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -530,7 +530,7 @@
{
PyObject *result;
Py_ssize_t total = 0;
- int n;
+ Py_ssize_t n;
if (self->fd < 0)
return err_closed();
@@ -563,9 +563,18 @@
}
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;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list