diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-07-24 02:43:41 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-07-24 02:43:41 +0000 |
| commit | 835df3a1d2aef34df8468ce3046ad1c90333d7a0 (patch) | |
| tree | d22834fc143b9ed887fac9996a48a5849e57454a /epan/dissectors/packet-dsi.c | |
| parent | 910f98eb86c4662c25a66106f502395f18304a83 (diff) | |
| download | wireshark-835df3a1d2aef34df8468ce3046ad1c90333d7a0.tar.gz | |
convert some uses of tvb_get_string() to ep_tvb_get_string()
there was at least one obvious memleak in one of the uses of tvb_get_string()
svn path=/trunk/; revision=15027
Diffstat (limited to 'epan/dissectors/packet-dsi.c')
| -rw-r--r-- | epan/dissectors/packet-dsi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dsi.c b/epan/dissectors/packet-dsi.c index 04f1415bb8..75c1eaed99 100644 --- a/epan/dissectors/packet-dsi.c +++ b/epan/dissectors/packet-dsi.c @@ -414,10 +414,9 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) case 4: /* DNS */ case 5: /* SSH tunnel */ if (len > 2) { - tmp = tvb_get_string(tvb, ofs +2, len -2); + tmp = ep_tvb_get_string(tvb, ofs +2, len -2); ti = proto_tree_add_text(adr_tree, tvb, ofs, len, "%s: %s", (type==4)?"dns":"ssh tunnel", tmp); - g_free(tmp); break; } else { @@ -468,14 +467,13 @@ dissect_dsi_reply_get_status(tvbuff_t *tvb, proto_tree *tree, gint offset) ofs = utf_ofs; ulen = tvb_get_ntohs(tvb, ofs); - tmp = tvb_get_string(tvb, ofs + 2, ulen); + tmp = ep_tvb_get_string(tvb, ofs + 2, ulen); ti = proto_tree_add_text(tree, tvb, ofs, ulen + 2, "UTF8 server name: %s", tmp); sub_tree = proto_item_add_subtree(ti, ett_dsi_utf8_name); proto_tree_add_uint(sub_tree, hf_dsi_utf8_server_name_len, tvb, ofs, 2, ulen); ofs += 2; proto_tree_add_string(sub_tree, hf_dsi_utf8_server_name, tvb, ofs, ulen, tmp); ofs += ulen; - g_free(tmp); } return offset; |