diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-07-24 04:24:30 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-07-24 04:24:30 +0000 |
| commit | 699e51ccdd4e3dbae670ba0fa2e783d874b1a687 (patch) | |
| tree | cbd7445d22f2947cf6bdfee2c055259d7d37add4 /epan/dissectors/packet-slsk.c | |
| parent | 05c7ac167efe3834a3643a259679d101570607ca (diff) | |
some more ep_tvb_get_string updates
svn path=/trunk/; revision=15034
Diffstat (limited to 'epan/dissectors/packet-slsk.c')
| -rw-r--r-- | epan/dissectors/packet-slsk.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index b9864a8a82..9b9bb07ce2 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -977,11 +977,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset += 4+len; len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len); - str = tvb_get_string(tvb, offset+4, len); + str = ep_tvb_get_string(tvb, offset+4, len); proto_tree_add_string_format(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "Connection Type: %s (Char: %s)", connection_type(str), format_text(str, len)); - g_free(str); offset += 4+len; } else if (check_slsk_format(tvb, offset, "issiii")) { @@ -998,11 +997,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset += 4+len; len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len); - str = tvb_get_string(tvb, offset+4, len); + str = ep_tvb_get_string(tvb, offset+4, len); proto_tree_add_string_format(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "Connection Type: %s (Char: %s)", connection_type(str), format_text(str, len)); - g_free(str); offset += 4+len; proto_tree_add_item(slsk_tree, hf_slsk_ip, tvb, offset, 4, FALSE); offset += 4; @@ -2359,11 +2357,10 @@ static void dissect_slsk_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree offset += 4+len; len = tvb_get_letohl(tvb, offset); proto_tree_add_uint(slsk_tree, hf_slsk_string_length, tvb, offset, 4, len); - str = tvb_get_string(tvb, offset+4, len); + str = ep_tvb_get_string(tvb, offset+4, len); proto_tree_add_string_format(slsk_tree, hf_slsk_connection_type, tvb, offset+4, len, str, "Connection Type: %s (Char: %s)", connection_type(str), format_text(str, len)); - g_free(str); offset += 4+len; proto_tree_add_uint(slsk_tree, hf_slsk_token, tvb, offset, 4, tvb_get_letohl(tvb, offset)); offset += 4; |