svn commit: samba r25212 - in branches/SAMBA_4_0/source/libcli/util: .

[metze at samba.org]

Author: metze
Date: 2007-09-18 13:31:05 +0000 (Tue, 18 Sep 2007)
New Revision: 25212

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

Log:
merge some stuff from samba3

metze
Modified:
   branches/SAMBA_4_0/source/libcli/util/asn1.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/util/asn1.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/util/asn1.c	2007-09-18 13:25:48 UTC (rev 25211)
+++ branches/SAMBA_4_0/source/libcli/util/asn1.c	2007-09-18 13:31:05 UTC (rev 25212)
@@ -360,6 +360,9 @@
 /* Peek into an ASN1 buffer, not advancing the pointer */
 BOOL asn1_peek(struct asn1_data *data, void *p, int len)
 {
+	if (data->has_error)
+		return False;
+
 	if (len < 0 || data->ofs + len < data->ofs || data->ofs + len < len)
 		return False;
 
@@ -405,7 +408,7 @@
 		return False;
 	}
 
-	if (!asn1_peek(data, &b, sizeof(b)))
+	if (!asn1_peek_uint8(data, &b))
 		return False;
 
 	return (b == tag);