From 1d9c472cae6d080cbee2b49f394a6b224772ccbf Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Fri, 10 Aug 2012 02:05:19 +0000 Subject: convert some simple uses to use ephemeral memory svn path=/trunk/; revision=44413 --- epan/dissectors/packet-elcom.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'epan/dissectors/packet-elcom.c') diff --git a/epan/dissectors/packet-elcom.c b/epan/dissectors/packet-elcom.c index b69f6bb3e7..e93acd4c03 100644 --- a/epan/dissectors/packet-elcom.c +++ b/epan/dissectors/packet-elcom.c @@ -217,19 +217,16 @@ dissect_lower_address(proto_item *ti_arg, gint ett_arg, offset += 8; /* skip the zero bytes */ /* SUFFIX */ - suffix = tvb_get_string(tvb, offset+1, len2); + suffix = tvb_get_ephemeral_string(tvb, offset+1, len2); ti = proto_tree_add_item(tree, hf_suff, tvb, offset, 1, ENC_ASCII|ENC_LITTLE_ENDIAN); offset += len2+1; if (!(suffix[0] == 'A' || suffix[0] == 'B')) { - g_free(suffix); proto_item_append_text(ti, " (invalid)"); return offset; } proto_item_append_text(ti, " (%s)", val_to_str(suffix[1], suffix_vals, "<<-- WHAT?") ); - - g_free(suffix); return offset; } @@ -452,9 +449,8 @@ dissect_elcom(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_get_guint8(tvb, 3+1+TOTAL_LEN+LOWADR_LEN) != SUFFIX_LEN) return; /* finally believe that there is valid suffix */ - suffix = tvb_get_string(tvb, 3+2+LOWADR_LEN, 2); + suffix = tvb_get_ephemeral_string(tvb, 3+2+LOWADR_LEN, 2); col_append_fstr(pinfo->cinfo, COL_INFO, " %s Connect", suffix); - g_free(suffix); break; case P_RELRQ: -- cgit v1.2.3