aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-srvloc.c
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-08-10 14:17:27 +0000
committerRonnie Sahlberg <ronnie_sahlberg@ozemail.com.au>2005-08-10 14:17:27 +0000
commitefa1f430059f40d054d9f85fb0869583ffb76d2b (patch)
treef6a0350512578762858d1a0071abe17ae9a31ac6 /epan/dissectors/packet-srvloc.c
parentb4441e6748170f63f19a3d0467d301f5852f161c (diff)
convert some tvb_fake_unicode() to tvb_get_ephemeral_faked_unicode()
svn path=/trunk/; revision=15272
Diffstat (limited to 'epan/dissectors/packet-srvloc.c')
-rw-r--r--epan/dissectors/packet-srvloc.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/packet-srvloc.c b/epan/dissectors/packet-srvloc.c
index c4dee7ee27..56dd72ce6c 100644
--- a/epan/dissectors/packet-srvloc.c
+++ b/epan/dissectors/packet-srvloc.c
@@ -414,10 +414,9 @@ add_v1_string(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length,
switch (encoding) {
case CHARSET_ISO_10646_UCS_2:
- unicode_str = tvb_fake_unicode(tvb, offset, length/2, FALSE);
+ unicode_str = tvb_get_ephemeral_faked_unicode(tvb, offset, length/2, FALSE);
proto_tree_add_string(tree, hf, tvb, offset, length,
unicode_str);
- g_free(unicode_str);
break;
default:
@@ -508,12 +507,10 @@ attr_list(proto_tree *tree, int hf, tvbuff_t *tvb, int offset, int length,
case CHARSET_ISO_10646_UCS_2:
- tmp = tvb_fake_unicode(tvb, offset, length/2, FALSE);
+ tmp = tvb_get_ephemeral_faked_unicode(tvb, offset, length/2, FALSE);
type_len = strcspn(tmp, "=");
- g_free(tmp);
- attr_type = tvb_fake_unicode(tvb, offset+2, type_len-1, FALSE);
+ attr_type = tvb_get_ephemeral_faked_unicode(tvb, offset+2, type_len-1, FALSE);
proto_tree_add_string(tree, hf, tvb, offset, type_len*2, attr_type);
- g_free(attr_type);
i=1;
for (foffset = offset + ((type_len*2)+2); foffset<length; foffset += 2) {