From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 16 Jan 2024 11:53:26 +0000 (+0100)
Subject: [3.11] gh-114077: Fix OverflowError in socket.sendfile() when pass count >2GiB (GH... 
X-Git-Tag: v3.11.8~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0e922658755a6e62995661f03aca86cda13ba03e;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-114077: Fix OverflowError in socket.sendfile() when pass count >2GiB (GH-114079) (GH-114111)

(cherry picked from commit d4dfad2aa9e76038302b0c5a29ebacc2723ed50d)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/socket.py b/Lib/socket.py
index b5d46eb32bda..a0567b76bcfe 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -381,7 +381,7 @@ class socket(_socket.socket):
                     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
new file mode 100644
index 000000000000..dba086f3a8a4
--- /dev/null
+++ 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.