[3.11] gh-114077: Fix OverflowError in socket.sendfile() when pass co…

…unt >2GiB (GH-114079) (GH-114111) (cherry picked from commit d4dfad2) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
python · Jan 16, 2024 · 0e92265 · 0e92265
1 parent f5cbed1
commit 0e92265
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Lib/socket.py b/Lib/socket.py
@@ -381,7 +381,7 @@ def _sendfile_use_sendfile(self, file, offset=0, count=None):
                     if timeout and not selector_select(timeout):
                         raise TimeoutError('timed out')
                     if count:
-                        blocksize = count - total_sent
+                        blocksize = min(count - total_sent, blocksize)
                         if blocksize <= 0:
                             break
                     try:

diff --git a/Misc/NEWS.d/next/Library/2024-01-15-12-12-54.gh-issue-114077.KcVnfj.rst b/Misc/NEWS.d/next/Library/2024-01-15-12-12-54.gh-issue-114077.KcVnfj.rst
@@ -0,0 +1,2 @@
+Fix possible :exc:`OverflowError` in :meth:`socket.socket.sendfile` when pass
+*count* larger than 2 GiB on 32-bit platform.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Fix possible :exc:`OverflowError` in :meth:`socket.socket.sendfile` when pass
		count larger than 2 GiB on 32-bit platform.