[Python-checkins] python/dist/src/Lib tarfile.py,1.18,1.19

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8425

Modified Files:
	tarfile.py 
Log Message:
Patch #1014992: Never return more than a line from readline.
Will backport to 2.3.


Index: tarfile.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/tarfile.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- tarfile.py	22 Aug 2004 21:28:32 -0000	1.18
+++ tarfile.py	25 Aug 2004 10:52:58 -0000	1.19
@@ -509,14 +509,12 @@
             nl = min(nl, size)
         else:
             size -= len(self.linebuffer)
-            while nl < 0:
+            while (nl < 0 and size > 0):
                 buf = self.read(min(size, 100))
                 if not buf:
                     break
                 self.linebuffer += buf
                 size -= len(buf)
-                if size <= 0:
-                    break
                 nl = self.linebuffer.find("\n")
             if nl == -1:
                 s = self.linebuffer