From 1beea27299b836fd9194b769f2f79913ed20219e Mon Sep 17 00:00:00 2001
From: "Andrew M. Kuchling" <amk@amk.ca>
Date: Sat, 23 Feb 2008 19:28:58 +0000
Subject: #1389051, #1092502: fix excessively large allocations when using
 read() on a socket

---
 Lib/socket.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/socket.py b/Lib/socket.py
index 6b4b743..2ca8ff6 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
-- 
cgit v0.12