From: Victor Stinner <vstinner@redhat.com>
Date: Thu, 22 Nov 2018 14:03:40 +0000 (+0100)
Subject: bpo-24658: os.read() reuses _PY_READ_MAX (GH-10657)
X-Git-Tag: v3.8.0a1~452
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a0d7a7648547ffb77144bf2480155f6d7940dea;p=python

bpo-24658: os.read() reuses _PY_READ_MAX (GH-10657)

os_read_impl() now also truncates the size to _PY_READ_MAX
on macOS, to avoid to allocate a larger buffer even if _Py_read() is
limited to _PY_READ_MAX bytes (ex: INT_MAX on macOS).
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index bd97f0abe1..44d6009bda 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -8410,11 +8410,7 @@ os_read_impl(PyObject *module, int fd, Py_ssize_t length)
         return posix_error();
     }
 
-#ifdef MS_WINDOWS
-    /* On Windows, the count parameter of read() is an int */
-    if (length > INT_MAX)
-        length = INT_MAX;
-#endif
+    length = Py_MIN(length, _PY_READ_MAX);
 
     buffer = PyBytes_FromStringAndSize((char *)NULL, length);
     if (buffer == NULL)