From 7267cb3312f148be8cd00eb76b8e137cd4b2a314 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 19 Jun 2005 10:37:45 +0000 Subject: r7749: some bug fixes from testing with socket:testnonblock - fixed some infinite loops in asn1.c - ensure asn1 callers know if an error is end of buffer or bad data - handle npending 0 in ldap server (This used to be commit f22c3b84c8912ccd36e676a782b58f1841be8875) --- source4/libcli/util/asn1.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'source4/libcli/util') diff --git a/source4/libcli/util/asn1.c b/source4/libcli/util/asn1.c index 10afd74273..2a4c75d939 100644 --- a/source4/libcli/util/asn1.c +++ b/source4/libcli/util/asn1.c @@ -299,8 +299,12 @@ BOOL asn1_peek(struct asn1_data *data, void *p, int len) if (len < 0 || data->ofs + len < data->ofs || data->ofs + len < len) return False; - if (data->ofs + len > data->length) + if (data->ofs + len > data->length) { + /* we need to mark the buffer as consumed, so the caller knows + this was an out of data error, and not a decode error */ + data->ofs = data->length; return False; + } memcpy(p, data->data + data->ofs, len); return True; @@ -437,7 +441,7 @@ BOOL asn1_read_OID(struct asn1_data *data, const char **OID) do { asn1_read_uint8(data, &b); v = (v<<7) | (b&0x7f); - } while (!data->has_error && b & 0x80); + } while (!data->has_error && (b & 0x80)); tmp_oid = talloc_asprintf_append(tmp_oid, " %u", v); } @@ -540,7 +544,7 @@ BOOL asn1_read_implicit_Integer(struct asn1_data *data, int *i) uint8_t b; *i = 0; - while (asn1_tag_remaining(data)>0) { + while (!data->has_error && asn1_tag_remaining(data)>0) { if (!asn1_read_uint8(data, &b)) return False; *i = (*i << 8) + b; } @@ -564,7 +568,7 @@ BOOL asn1_read_enumerated(struct asn1_data *data, int *v) *v = 0; if (!asn1_start_tag(data, ASN1_ENUMERATED)) return False; - while (asn1_tag_remaining(data)>0) { + while (!data->has_error && asn1_tag_remaining(data)>0) { uint8_t b; asn1_read_uint8(data, &b); *v = (*v << 8) + b; -- cgit