summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2007-08-06 04:07:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 15:01:30 -0500
commit210971d092e908e1ec482646b3ceb2f579d89440 (patch)
tree4515368c6c7d6152ab1601e287c1b30712d4d43c /source4
parent85e197502221049085e2ed882a1011229a623811 (diff)
downloadsamba-210971d092e908e1ec482646b3ceb2f579d89440.tar.gz
samba-210971d092e908e1ec482646b3ceb2f579d89440.tar.bz2
samba-210971d092e908e1ec482646b3ceb2f579d89440.zip
r24248: Attempt to fix bug #4830 by <mwallnoefer@yahoo.de>. If there is no
payload to the control, we still need to inialise *value, as otherwise we read uninitialised data later. Andrew Bartlett (This used to be commit f6566480b7f1b4036b38284aa539f3a69f5c4573)
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/ldap/ldap_controls.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/libcli/ldap/ldap_controls.c b/source4/libcli/ldap/ldap_controls.c
index 4f76c7315b..3a5d14c0c9 100644
--- a/source4/libcli/ldap/ldap_controls.c
+++ b/source4/libcli/ldap/ldap_controls.c
@@ -1143,6 +1143,7 @@ BOOL ldap_decode_control_wrapper(void *mem_ctx, struct asn1_data *data, struct l
ctrl->data = NULL;
if (!asn1_peek_tag(data, ASN1_OCTET_STRING)) {
+ *value = data_blob(NULL, 0);
goto end_tag;
}