From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 22 Nov 2018 14:25:25 +0000 (-0800)
Subject: bpo-24658: os.read() reuses _PY_READ_MAX (GH-10657)
X-Git-Tag: v3.6.8rc1~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c15e508baec7e542933db2b31ea950a646cd968;p=thirdparty%2FPython%2Fcpython.git

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).
(cherry picked from commit 9a0d7a7648547ffb77144bf2480155f6d7940dea)

Co-authored-by: Victor Stinner <vstinner@redhat.com>
---

diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index f5642d267299..b7091ca4c234 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -7912,11 +7912,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)