diff --git a/Lib/test/test_os/test_os.py b/Lib/test/test_os/test_os.py index 8b6b7deb65b88b..9c9893e5affabe 100644 --- a/Lib/test/test_os/test_os.py +++ b/Lib/test/test_os/test_os.py @@ -3917,6 +3917,18 @@ async def test_headers(self): await self.server.wait_closed() self.assertEqual(hash(self.server_buffer), hash(expected_data)) + @requires_headers_trailers + async def test_headers_with_zero_count(self): + offset = len(self.DATA) - 2 + sent = await self.async_sendfile(self.sockno, self.fileno, offset, 0, + headers=[b"H"]) + self.client.close() + await self.server.wait_closed() + + expected = b"H" + self.DATA[offset:] + self.assertEqual(self.server_buffer, expected) + self.assertEqual(sent, len(expected)) + @requires_headers_trailers async def test_trailers(self): TESTFN2 = os_helper.TESTFN + "2" diff --git a/Misc/NEWS.d/next/Library/2026-11-21-11-38-44.gh-issue-162378.w2q5PF.rst b/Misc/NEWS.d/next/Library/2026-11-21-11-38-44.gh-issue-162378.w2q5PF.rst new file mode 100644 index 00000000000000..1bc957e4cffb33 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-11-21-11-38-44.gh-issue-162378.w2q5PF.rst @@ -0,0 +1,2 @@ +Fix :func:`os.sendfile` skipping file data on macOS when called with headers +and a zero *count*. Patch by Maurycy Pawłowski-Wieroński. diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 619154309b40e3..5bc3529f946516 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -12644,15 +12644,18 @@ os_sendfile_impl(PyObject *module, int out_fd, int in_fd, PyObject *offobj, headers, sf.hdr_cnt, PyBUF_SIMPLE) < 0) return NULL; #ifdef __APPLE__ - for (i = 0; i < sf.hdr_cnt; i++) { - Py_ssize_t blen = sf.headers[i].iov_len; + // Positive limits include headers. Zero means send to EOF. + if (sbytes != 0) { + for (i = 0; i < sf.hdr_cnt; i++) { + Py_ssize_t blen = sf.headers[i].iov_len; # define OFF_T_MAX 0x7fffffffffffffff - if (sbytes >= OFF_T_MAX - blen) { - PyErr_SetString(PyExc_OverflowError, - "sendfile() header is too large"); - return NULL; + if (sbytes >= OFF_T_MAX - blen) { + PyErr_SetString(PyExc_OverflowError, + "sendfile() header is too large"); + return NULL; + } + sbytes += blen; } - sbytes += blen; } #endif }