diff Lib/socket.py @ 45475:4eb5a667c882 legacy-trunk

#1389051, #1092502: fix excessively large allocations when using read() on a socket
author Andrew M. Kuchling <amk@amk.ca>
date Sat, 23 Feb 2008 19:28:58 +0000
parents 73bc002252bf
children 54606ea9f4c7
line wrap: on
line diff
--- a/Lib/socket.py	Sat Feb 23 19:02:33 2008 +0000
+++ b/Lib/socket.py	Sat Feb 23 19:28:58 2008 +0000
@@ -328,7 +328,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