diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-11-22 06:25:25 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 06:25:25 -0800 |
| commit | 0c15e508baec7e542933db2b31ea950a646cd968 (patch) | |
| tree | a023877f975ec1e180571c9caa969c62a83f1fc9 | |
| parent | c487cf9261c61f0db4e5d1df3c83a60384b330db (diff) | |
| download | cpython-git-0c15e508baec7e542933db2b31ea950a646cd968.tar.gz | |
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>
| -rw-r--r-- | Modules/posixmodule.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index f5642d2672..b7091ca4c2 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) |