diff options
author | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-21 14:56:55 +0000 |
---|---|---|
committer | etxrab <etxrab@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-21 14:56:55 +0000 |
commit | f731f5386e0c59a7c476c48a18dd4799f7a3a5ee (patch) | |
tree | 4dba73c83f7809e237c991c650b9c2fb7b003858 | |
parent | 1ba03306cf21ba64bd275b5e566d04b02207ba04 (diff) |
The CLDAP attribute value on a CLDAP reply is no longer being decoded
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5239
It got broken in Revision 33390 I think, if attr_type is unset at this point it should be set in the calling function.
http://anonsvn.wireshark.org/viewvc/trunk/asn1/ldap/ldap.cnf?r1=33388&r2=33390
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34176 f5534014-38df-0310-8fa8-9805f1628bb7
-rw-r--r-- | asn1/ldap/ldap.cnf | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ldap.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index 8d5cc93111..3c19ec6553 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -463,7 +463,7 @@ ldap_conv_info_t *ldap_info; guint32 i, len; int old_offset = offset; - attr_type=NULL; + /* attr_type, should be set before calling this function */ /* extract the value of the octetstring */ offset = dissect_ber_octet_string(FALSE, actx, NULL, tvb, offset, hf_index, &next_tvb); diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 290877239d..d32f5cb084 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -2161,7 +2161,7 @@ dissect_ldap_AttributeValue(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of guint32 i, len; int old_offset = offset; - attr_type=NULL; + /* attr_type, should be set before calling this function */ /* extract the value of the octetstring */ offset = dissect_ber_octet_string(FALSE, actx, NULL, tvb, offset, hf_index, &next_tvb); |