diff options
author | Dario Lombardo <lomato@gmail.com> | 2014-06-17 17:30:58 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2014-06-18 14:13:58 +0000 |
commit | 971ffd683ea23362bd8009567ff7860371e6e2cc (patch) | |
tree | 28c9ada98d2e59b196fc839d39ab2448fd436968 /epan/dissectors/packet-socks.c | |
parent | 421d817d70737ebd459b7027274bf38bb2d9a2ff (diff) |
Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe
Reviewed-on: https://code.wireshark.org/review/2376
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-socks.c')
-rw-r--r-- | epan/dissectors/packet-socks.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-socks.c b/epan/dissectors/packet-socks.c index 23d711ee43..e692558604 100644 --- a/epan/dissectors/packet-socks.c +++ b/epan/dissectors/packet-socks.c @@ -267,7 +267,7 @@ static int display_address(tvbuff_t *tvb, int offset, proto_tree *tree) { gchar* str; len = tvb_get_guint8(tvb, offset); - str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+1, len, ENC_ASCII); proto_tree_add_string(tree, hf_socks_remote_name, tvb, offset, len+1, str); offset += (len+1); } @@ -568,12 +568,12 @@ client_display_socks_v5(tvbuff_t *tvb, int offset, packet_info *pinfo, case USER_NAME_AUTHENTICATION: /* process user name */ len = tvb_get_guint8(tvb, offset); - str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+1, len, ENC_ASCII); proto_tree_add_string(tree, hf_socks_username, tvb, offset, len+1, str); offset += (len+1); len = tvb_get_guint8(tvb, offset); - str = tvb_get_string(wmem_packet_scope(), tvb, offset+1, len); + str = tvb_get_string_enc(wmem_packet_scope(), tvb, offset+1, len, ENC_ASCII); proto_tree_add_string(tree, hf_socks_password, tvb, offset, len+1, str); /* offset += (len+1); */ break; |