ASN1: use a talloc context in read_contextSimple

Pair-programmed-with: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>

diff --git a/lib/util/asn1.c b/lib/util/asn1.c
index 9d6d4164f107954923c40fb0ebae8940d603cf87..d81e50fd9be3bbb1c5fddbd4491d1b8e04da1dec 100644 (file)
--- a/lib/util/asn1.c
+++ b/lib/util/asn1.c
@@ -927,7 +927,8 @@ bool asn1_read_OctetString(struct asn1_data *data, TALLOC_CTX *mem_ctx, DATA_BLO
        return false;
 }
 
-bool asn1_read_ContextSimple(struct asn1_data *data, uint8_t num, DATA_BLOB *blob)
+bool asn1_read_ContextSimple(struct asn1_data *data, TALLOC_CTX *mem_ctx, uint8_t num,
+                            DATA_BLOB *blob)
 {
        int len;
        ZERO_STRUCTP(blob);
@@ -937,7 +938,7 @@ bool asn1_read_ContextSimple(struct asn1_data *data, uint8_t num, DATA_BLOB *blo
                data->has_error = true;
                return false;
        }
-       *blob = data_blob(NULL, len);
+       *blob = data_blob_talloc(mem_ctx, NULL, len);
        if ((len != 0) && (!blob->data)) {
                data->has_error = true;
                return false;

diff --git a/lib/util/asn1.h b/lib/util/asn1.h
index 95e7dbf634aac98a89a947d28f782ed2cc426287..ddd6986357435c620300d35660ed4ab38822feae 100644 (file)
--- a/lib/util/asn1.h
+++ b/lib/util/asn1.h
@@ -87,7 +87,7 @@ bool asn1_check_OID(struct asn1_data *data, const char *OID);
 bool asn1_read_LDAPString(struct asn1_data *data, TALLOC_CTX *mem_ctx, char **s);
 bool asn1_read_GeneralString(struct asn1_data *data, TALLOC_CTX *mem_ctx, char **s);
 bool asn1_read_OctetString(struct asn1_data *data, TALLOC_CTX *mem_ctx, DATA_BLOB *blob);
-bool asn1_read_ContextSimple(struct asn1_data *data, uint8_t num, DATA_BLOB *blob);
+bool asn1_read_ContextSimple(struct asn1_data *data, TALLOC_CTX *mem_ctx, uint8_t num, DATA_BLOB *blob);
 bool asn1_read_implicit_Integer(struct asn1_data *data, int *i);
 bool asn1_read_Integer(struct asn1_data *data, int *i);
 bool asn1_read_BitString(struct asn1_data *data, TALLOC_CTX *mem_ctx, DATA_BLOB *blob, uint8_t *padding);

diff --git a/libcli/ldap/ldap_message.c b/libcli/ldap/ldap_message.c
index c89705bbf4102b155f38f456f84a03e20eafe1d2..9546dce24f5b387bf69b7ad4218f9d15a2abf07f 100644 (file)
--- a/libcli/ldap/ldap_message.c
+++ b/libcli/ldap/ldap_message.c
@@ -1232,7 +1232,7 @@ _PUBLIC_ NTSTATUS ldap_decode(struct asn1_data *data,
                if (!ldap_decode_response(msg, data, &r->response)) goto prot_err;
                if (asn1_peek_tag(data, ASN1_CONTEXT_SIMPLE(7))) {
                        DATA_BLOB tmp_blob = data_blob(NULL, 0);
-                       if (!asn1_read_ContextSimple(data, 7, &tmp_blob)) goto prot_err;
+                       if (!asn1_read_ContextSimple(data, msg, 7, &tmp_blob)) goto prot_err;
                        r->SASL.secblob = talloc(msg, DATA_BLOB);
                        if (!r->SASL.secblob) {
                                return NT_STATUS_LDAP(LDAP_OPERATIONS_ERROR);
@@ -1501,7 +1501,7 @@ _PUBLIC_ NTSTATUS ldap_decode(struct asn1_data *data,
 
                msg->type = LDAP_TAG_ExtendedRequest;
                if (!asn1_start_tag(data,tag)) goto prot_err;
-               if (!asn1_read_ContextSimple(data, 0, &tmp_blob)) {
+               if (!asn1_read_ContextSimple(data, msg, 0, &tmp_blob)) {
                        goto prot_err;
                }
                r->oid = blob2string_talloc(msg, tmp_blob);
@@ -1511,7 +1511,7 @@ _PUBLIC_ NTSTATUS ldap_decode(struct asn1_data *data,
                }
 
                if (asn1_peek_tag(data, ASN1_CONTEXT_SIMPLE(1))) {
-                       if (!asn1_read_ContextSimple(data, 1, &tmp_blob)) goto prot_err;
+                       if (!asn1_read_ContextSimple(data, msg, 1, &tmp_blob)) goto prot_err;
                        r->value = talloc(msg, DATA_BLOB);
                        if (!r->value) {
                                return NT_STATUS_LDAP(LDAP_OPERATIONS_ERROR);
@@ -1535,7 +1535,7 @@ _PUBLIC_ NTSTATUS ldap_decode(struct asn1_data *data,
                if (!ldap_decode_response(msg, data, &r->response)) goto prot_err;
 
                if (asn1_peek_tag(data, ASN1_CONTEXT_SIMPLE(10))) {
-                       if (!asn1_read_ContextSimple(data, 1, &tmp_blob)) goto prot_err;
+                       if (!asn1_read_ContextSimple(data, msg, 1, &tmp_blob)) goto prot_err;
                        r->oid = blob2string_talloc(msg, tmp_blob);
                        data_blob_free(&tmp_blob);
                        if (!r->oid) {
@@ -1546,7 +1546,7 @@ _PUBLIC_ NTSTATUS ldap_decode(struct asn1_data *data,
                }
 
                if (asn1_peek_tag(data, ASN1_CONTEXT_SIMPLE(11))) {
-                       if (!asn1_read_ContextSimple(data, 1, &tmp_blob)) goto prot_err;
+                       if (!asn1_read_ContextSimple(data, msg, 1, &tmp_blob)) goto prot_err;
                        r->value = talloc(msg, DATA_BLOB);
                        if (!r->value) {
                                return NT_STATUS_LDAP(LDAP_OPERATIONS_ERROR);