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 /epan/dissectors/packet-smb-common.h | |
| parent | 740c1c4aeb072e81b13b95020a1547da8eecffbf (diff) | |
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 'epan/dissectors/packet-smb-common.h')
| -rw-r--r-- | epan/dissectors/packet-smb-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-smb-common.h b/epan/dissectors/packet-smb-common.h index 0188bf47cd..c7081c1b0e 100644 --- a/epan/dissectors/packet-smb-common.h +++ b/epan/dissectors/packet-smb-common.h @@ -37,7 +37,7 @@ int display_unicode_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_i int display_ms_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_index, char **data); int dissect_ms_compressed_string(tvbuff_t *tvb, proto_tree *tree, int offset, int hf_index, - gboolean prepend_dot, char **data); + char **data); const gchar *get_unicode_or_ascii_string(tvbuff_t *tvb, int *offsetp, gboolean useunicode, int *len, gboolean nopad, gboolean exactlen, |