From: Andrew M. Kuchling <amk@amk.ca>
Date: Sat, 23 Feb 2008 19:28:58 +0000 (+0000)
Subject: #1389051, #1092502: fix excessively large allocations when using read() on a socket
X-Git-Tag: v2.6a1~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1beea27299b836fd9194b769f2f79913ed20219e;p=thirdparty%2FPython%2Fcpython.git

#1389051, #1092502: fix excessively large allocations when using read() on a socket
---

diff --git a/Lib/socket.py b/Lib/socket.py
index 6b4b743f6807..2ca8ff61ebde 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -328,7 +328,7 @@ class _fileobject(object):
             self._rbuf = ""
             while True:
                 left = size - buf_len
-                recv_size = max(self._rbufsize, left)
+                recv_size = min(self._rbufsize, left)
                 data = self._sock.recv(recv_size)
                 if not data:
                     break