Commits

Victor Stinner committed f26c91b Draft

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

  • Participants
  • Parent commits 7cf4ea6
  • Branches 2.7

Comments (0)

Files changed (2)

 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.
 

File Modules/_io/fileio.c

 {
     PyObject *result;
     Py_ssize_t total = 0;
-    int n;
+    Py_ssize_t n;
 
     if (self->fd < 0)
         return err_closed();
         }
         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;