summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-12-14 00:33:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:36 -0500
commit4730a56263b0547faabbfadb845e8b92bd0b9441 (patch)
treecf354226b843ce5a337ea037a933991b72dcedd7
parent5b713a206bf9c05faad750512886f4bbeebb21f8 (diff)
downloadsamba-4730a56263b0547faabbfadb845e8b92bd0b9441.tar.gz
samba-4730a56263b0547faabbfadb845e8b92bd0b9441.tar.bz2
samba-4730a56263b0547faabbfadb845e8b92bd0b9441.zip
r4188: Ensure we add in the upper length in the right place !
Jeremy. (This used to be commit 9d4e57f06c4f75f42036e91401b0d0392647752b)
-rw-r--r--source3/libsmb/clireadwrite.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libsmb/clireadwrite.c b/source3/libsmb/clireadwrite.c
index 64f16e94ca..1785905ff2 100644
--- a/source3/libsmb/clireadwrite.c
+++ b/source3/libsmb/clireadwrite.c
@@ -122,7 +122,7 @@ ssize_t cli_read(struct cli_state *cli, int fnum, char *buf, off_t offset, size_
}
size2 = SVAL(cli->inbuf, smb_vwv5);
- size2 |= (SVAL(cli->inbuf, smb_vwv7) & 1);
+ size2 |= (((unsigned int)(SVAL(cli->inbuf, smb_vwv7) & 1)) << 16);
if (size2 > readsize) {
DEBUG(5,("server returned more than we wanted!\n"));