Changeset 134 for branches/samba-3.0/source/libsmb/clireadwrite.c

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

File:

• branches/samba-3.0/source/libsmb/clireadwrite.c (modified) (2 diffs)

branches/samba-3.0/source/libsmb/clireadwrite.c

@@ -353 +353 @@
 
         while (received < blocks) {
+                ssize_t size1 = 0;
 
                 while ((issued - received < mpx) && (issued < blocks)) {
                         ssize_t bsent = issued * block;
-                        ssize_t size1 = MIN(block, size - bsent);
+
+                        size1 = MIN(block, size - bsent);
 
                         if (!cli_issue_write(cli, fnum, offset + bsent,
@@ -375 +377 @@
 
                 bwritten += SVAL(cli->inbuf, smb_vwv2);
-                bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
+                if (size1 > 0xFFFF) {
+                        bwritten += (((int)(SVAL(cli->inbuf, smb_vwv4)))<<16);
+                }
         }