From: Andrew Tridgell <tridge@samba.org> 
Date: Sun, 1 Jul 2001 13:18:35 +0000 (+0000)
Subject: cli_read() was reading too many bytes.
X-Git-Tag: samba-2.2.5pre1~1861^2~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba79d2a030b9ae087f0cc4248baa6cf6bee112fb;p=thirdparty%2Fsamba.git

cli_read() was reading too many bytes.
---

diff --git a/source/libsmb/clireadwrite.c b/source/libsmb/clireadwrite.c
index 54d3fd18e3c..458532cb2ed 100644
--- a/source/libsmb/clireadwrite.c
+++ b/source/libsmb/clireadwrite.c
@@ -71,10 +71,9 @@ ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_
 	 */
 
 	readsize = (cli->max_xmit - (smb_size+32)) & ~1023;
-	if (readsize > size )
-		readsize = size;
 
 	while (total < size) {
+		readsize = MIN(readsize, size-total);
 
 		/* Issue a read and receive a reply */