diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-02-18 10:07:29 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-02-18 10:07:29 +0000 |
| commit | 37575374b8f99ffbcdc215a90266b6785bb579c9 (patch) | |
| tree | 0eee3da2b46ec1599e7a7a70879f632106afadb1 | |
| parent | cfd0be516b0e14aef697bca70d3db8e5e2af82c1 (diff) | |
Added one more string_or_null.
svn path=/trunk/; revision=27482
| -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 c472aaedc0..a23a23ac15 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -637,7 +637,7 @@ offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &v (matching_rule_dnattr?"dn:":""), (matching_rule_string?matching_rule_string:""), (matching_rule_string?":":""), - ldapvalue_string); + string_or_null(ldapvalue_string)); #.FN_FTR SubstringFilter/substrings/_item if (substring_item_final) { diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c index 5857840c2b..e59db0cf8c 100644 --- a/epan/dissectors/packet-ldap.c +++ b/epan/dissectors/packet-ldap.c @@ -1996,7 +1996,7 @@ dissect_ldap_T_extensibleMatch(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int (matching_rule_dnattr?"dn:":""), (matching_rule_string?matching_rule_string:""), (matching_rule_string?":":""), - ldapvalue_string); + string_or_null(ldapvalue_string)); return offset; |