mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
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 f22c3b84c8
)
This commit is contained in:
parent
7b23cd4588
commit
7267cb3312
@ -254,10 +254,10 @@ static void ldapsrv_recv(struct stream_connection *c, uint16_t flags)
|
||||
return;
|
||||
}
|
||||
if (npending == 0) {
|
||||
ldapsrv_terminate_connection(conn, "EOF from client");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
conn->partial.data = talloc_realloc_size(conn, conn->partial.data,
|
||||
conn->partial.length + npending);
|
||||
if (conn->partial.data == NULL) {
|
||||
|
@ -124,6 +124,8 @@ static int ildb_search(struct ldb_module *module, const char *base,
|
||||
if (ildb->rootDSE != NULL) {
|
||||
base = ldb_msg_find_string(ildb->rootDSE,
|
||||
"defaultNamingContext", "");
|
||||
} else {
|
||||
base = "";
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -501,7 +501,9 @@ static struct ldb_parse_tree *ldap_decode_filter_tree(TALLOC_CTX *mem_ctx,
|
||||
|
||||
ret->operation = LDB_OP_NOT;
|
||||
ret->u.not.child = ldap_decode_filter_tree(ret, data);
|
||||
|
||||
if (ret->u.not.child == NULL) {
|
||||
goto failed;
|
||||
}
|
||||
if (!asn1_end_tag(data)) {
|
||||
goto failed;
|
||||
}
|
||||
@ -595,7 +597,6 @@ static struct ldb_parse_tree *ldap_decode_filter_tree(TALLOC_CTX *mem_ctx,
|
||||
|
||||
failed:
|
||||
talloc_free(ret);
|
||||
DEBUG(0,("Failed to parse ASN.1 LDAP filter\n"));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user