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-logon.c | |
| 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-logon.c')
| -rw-r--r-- | epan/dissectors/packet-smb-logon.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-smb-logon.c b/epan/dissectors/packet-smb-logon.c index d34848e8dc..6d610cfff2 100644 --- a/epan/dissectors/packet-smb-logon.c +++ b/epan/dissectors/packet-smb-logon.c @@ -759,28 +759,28 @@ dissect_smb_pdc_response_ads(tvbuff_t *tvb, packet_info *pinfo _U_, offset += 16; /* forest dns name */ - offset=dissect_ms_compressed_string(tvb, tree, offset, hf_forest_dns_name, FALSE, NULL); + offset=dissect_ms_compressed_string(tvb, tree, offset, hf_forest_dns_name, NULL); /* domain dns name */ - offset=dissect_ms_compressed_string(tvb, tree, offset, hf_domain_dns_name, FALSE, NULL); + offset=dissect_ms_compressed_string(tvb, tree, offset, hf_domain_dns_name, NULL); /* server dns name */ - offset=dissect_ms_compressed_string(tvb, tree, offset, hf_server_dns_name, FALSE, NULL); + offset=dissect_ms_compressed_string(tvb, tree, offset, hf_server_dns_name, NULL); /* domain name */ - offset=dissect_ms_compressed_string(tvb, tree, offset, hf_domain_name, FALSE, NULL); + offset=dissect_ms_compressed_string(tvb, tree, offset, hf_domain_name, NULL); /* server name */ - offset=dissect_ms_compressed_string(tvb, tree, offset, hf_server_name, FALSE, NULL); + offset=dissect_ms_compressed_string(tvb, tree, offset, hf_server_name, NULL); /* user name */ - offset=dissect_ms_compressed_string(tvb, tree, offset, hf_user_name, FALSE, NULL); + offset=dissect_ms_compressed_string(tvb, tree, offset, hf_user_name, NULL); /* server_site name */ - offset=dissect_ms_compressed_string(tvb, tree, offset, hf_server_site_name, FALSE, NULL); + offset=dissect_ms_compressed_string(tvb, tree, offset, hf_server_site_name, NULL); /* client_site name */ - offset=dissect_ms_compressed_string(tvb, tree, offset, hf_client_site_name, FALSE, NULL); + offset=dissect_ms_compressed_string(tvb, tree, offset, hf_client_site_name, NULL); /* unknown uint8 type */ proto_tree_add_item(tree, hf_unknown8, tvb, offset, 1, TRUE); |