svn commit: samba r1674 - branches/SAMBA_4_0/source/libcli/raw

[tridge at samba.org]

Author: tridge
Date: 2004-08-09 20:47:31 +0000 (Mon, 09 Aug 2004)
New Revision: 1674
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=1674&nolog=1
Log:
fixed a bug in the handling of STR_LEN8BIT flagged strings



Modified:
   branches/SAMBA_4_0/source/libcli/raw/rawrequest.c

Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/rawrequest.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/rawrequest.c	2004-08-09 20:34:59 UTC (rev 1673)
+++ branches/SAMBA_4_0/source/libcli/raw/rawrequest.c	2004-08-09 20:47:31 UTC (rev 1674)
@@ -814,12 +814,15 @@
 	int extra;
 	dest->s = NULL;
 	
-	if (len_offset > blob->length-4) {
-		return 0;
-	}
 	if (flags & STR_LEN8BIT) {
+		if (len_offset > blob->length-1) {
+			return 0;
+		}
 		dest->private_length = CVAL(blob->data, len_offset);
 	} else {
+		if (len_offset > blob->length-4) {
+			return 0;
+		}
 		dest->private_length = IVAL(blob->data, len_offset);
 	}
 	extra = 0;