commit 664553a778dd10a854c554d309c78de012813629
author Andrew M. Kuchling <amk@amk.ca> Sat Feb 23 19:30:59 2008 +0000
committer Andrew M. Kuchling <amk@amk.ca> Sat Feb 23 19:30:59 2008 +0000
tree 6a74677717ba7f1c2a270a67c201d1dad0d09774
parent 37d4f7bc0c3b9c6e2bd858873c691c9d2bf091ae

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

Lib/socket.py

diff --git a/Lib/socket.py b/Lib/socket.py
index 0082e76..f79b282 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -305,7 +305,7 @@
             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