svn commit: samba r23902 - in branches: SAMBA_3_2/source/smbd SAMBA_3_2_0/source/smbd

[jra at samba.org]

Author: jra
Date: 2007-07-16 18:17:19 +0000 (Mon, 16 Jul 2007)
New Revision: 23902

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23902

Log:
Fix uninitialized read in devicetype noticed by Volker.
Jeremy

Modified:
   branches/SAMBA_3_2/source/smbd/reply.c
   branches/SAMBA_3_2_0/source/smbd/reply.c


Changeset:
Modified: branches/SAMBA_3_2/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/reply.c	2007-07-16 16:22:36 UTC (rev 23901)
+++ branches/SAMBA_3_2/source/smbd/reply.c	2007-07-16 18:17:19 UTC (rev 23902)
@@ -529,7 +529,7 @@
 	}
 
 	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);

Modified: branches/SAMBA_3_2_0/source/smbd/reply.c
===================================================================
--- branches/SAMBA_3_2_0/source/smbd/reply.c	2007-07-16 16:22:36 UTC (rev 23901)
+++ branches/SAMBA_3_2_0/source/smbd/reply.c	2007-07-16 18:17:19 UTC (rev 23902)
@@ -528,7 +528,7 @@
 	}
 
 	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);