diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-02-23 00:51:02 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-02-23 00:51:02 +0000 |
| commit | 47837956900070b04a47f0289de3fb0ce2c3251c (patch) | |
| tree | adfd156482ef20ce84a4fb62abe389cf2e894b52 /asn1/ldap/packet-ldap-template.h | |
| parent | 740c1c4aeb072e81b13b95020a1547da8eecffbf (diff) | |
| download | wireshark-47837956900070b04a47f0289de3fb0ce2c3251c.tar.gz | |
Split get_dns_name() into get_dns_name() and expand_dns_name().
In dissect_ms_compressed_string() dissect_mscldap_string() simply call
expand_dns_name() instead of using duplicate (and insecure) code. This
*might* break CLDAP and SMB dissection. If that's the case we should
probably revert get_dns_name() and simplify expand_dns_name().
Fixes infinite recursion errors found by joernchen of Phenoelit.
svn path=/trunk/; revision=36029
Diffstat (limited to 'asn1/ldap/packet-ldap-template.h')
| -rw-r--r-- | asn1/ldap/packet-ldap-template.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asn1/ldap/packet-ldap-template.h b/asn1/ldap/packet-ldap-template.h index bed5466e36..818195d335 100644 --- a/asn1/ldap/packet-ldap-template.h +++ b/asn1/ldap/packet-ldap-template.h @@ -103,7 +103,7 @@ typedef struct ldap_call_response { void register_ldap_name_dissector_handle(const char *attr_type, dissector_handle_t dissector); void register_ldap_name_dissector(const char *attr_type, dissector_t dissector, int proto); -int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int maxlen, gboolean prepend_dot); +int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int max_len, gboolean prepend_dot _U_); /*#include "packet-ldap-exp.h" */ |