summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-07-16 18:17:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:28:39 -0500
commitb4366f6c37457d082478e72f05040eb13df94b64 (patch)
tree5afc069d7df1735148050d32dd1736518ec42315
parent164f75efea51f4efe5b83bae31f3114ec270c8f4 (diff)
downloadsamba-b4366f6c37457d082478e72f05040eb13df94b64.tar.gz
samba-b4366f6c37457d082478e72f05040eb13df94b64.tar.bz2
samba-b4366f6c37457d082478e72f05040eb13df94b64.zip
r23902: Fix uninitialized read in devicetype noticed by Volker.
Jeremy (This used to be commit 98c23939731654440d2f008e44e11371eaddf014)
-rw-r--r--source3/smbd/reply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 8b6a164a66..2421e2ffd9 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -529,7 +529,7 @@ int reply_tcon_and_X(connection_struct *conn, char *inbuf,char *outbuf,int lengt
}
p += srvstr_pull_talloc(ctx, inbuf, SVAL(inbuf, smb_flg2), &client_devicetype, p,
- 6, STR_ASCII);
+ MIN(6,smb_bufrem(inbuf, p)), STR_ASCII);
if (client_devicetype == NULL) {
TALLOC_FREE(ctx);