Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Lib/test/test_os/test_os.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
17 changes: 10 additions & 7 deletions Modules/posixmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
Loading