svn commit: samba r2354 - in trunk/source/libsmb: .

[jra at samba.org]

Author: jra
Date: 2004-09-15 20:32:58 +0000 (Wed, 15 Sep 2004)
New Revision: 2354

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/trunk/source/libsmb&rev=2354&nolog=1

Log:
Now we've shipped 3.0.7, add in the DOS fix.
Jeremy.

Modified:
   trunk/source/libsmb/asn1.c


Changeset:
Modified: trunk/source/libsmb/asn1.c
===================================================================
--- trunk/source/libsmb/asn1.c	2004-09-15 17:03:05 UTC (rev 2353)
+++ trunk/source/libsmb/asn1.c	2004-09-15 20:32:58 UTC (rev 2354)
@@ -282,6 +282,9 @@
 /* Peek into an ASN1 buffer, not advancing the pointer */
 BOOL asn1_peek(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;
 
@@ -295,6 +298,9 @@
 /* read from a ASN1 buffer, advancing the buffer pointer */
 BOOL asn1_read(ASN1_DATA *data, void *p, int len)
 {
+	if (data->has_error)
+		return False;
+
 	if (!asn1_peek(data, p, len)) {
 		data->has_error = True;
 		return False;
@@ -480,6 +486,9 @@
 /* work out how many bytes are left in this nested tag */
 int asn1_tag_remaining(ASN1_DATA *data)
 {
+	if (data->has_error)
+		return 0;
+
 	if (!data->nesting) {
 		data->has_error = True;
 		return -1;