aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-tpncp.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2012-08-25 00:39:17 +0000
committerMichael Mann <mmann78@netscape.net>2012-08-25 00:39:17 +0000
commitc7cbfac88d2870796e1afd009cef389ba596796a (patch)
treec486a109151a4d15818d59e77c8e0c869bd0e1b4 /epan/dissectors/packet-tpncp.c
parent95d14df10a0c2a076e7c033f3095a826842d3741 (diff)
cleanup some unnecessary g_malloc calls
svn path=/trunk/; revision=44662
Diffstat (limited to 'epan/dissectors/packet-tpncp.c')
-rw-r--r--epan/dissectors/packet-tpncp.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c
index 8bbe430f1a..5209bae9b6 100644
--- a/epan/dissectors/packet-tpncp.c
+++ b/epan/dissectors/packet-tpncp.c
@@ -140,7 +140,6 @@ static void dissect_tpncp_data(gint data_id, tvbuff_t *tvb, proto_item *item,
guint16 g_ushort;
gint8 g_char;
guint8 g_uchar;
- gchar *g_str = NULL;
gint g_str_len, counter, bitshift, bitmask;
tpncp_data_field_info *current_tpncp_data_field_info = NULL;
@@ -153,13 +152,9 @@ static void dissect_tpncp_data(gint data_id, tvbuff_t *tvb, proto_item *item,
case 5: case 6: case 7: case 8:
if ((g_str_len = current_tpncp_data_field_info->tpncp_data_field_array_dim)) { /* add char array */
g_str_len = MIN(g_str_len, tvb_length_remaining(tvb, *offset));
- g_str = g_malloc(g_str_len);
- tvb_memcpy(tvb, g_str, *offset, g_str_len);
- g_str[g_str_len-1] = '\0';
- proto_tree_add_string(ltree, current_tpncp_data_field_info->tpncp_data_field_descr,
- tvb, *offset, g_str_len, g_str);
+ proto_tree_add_item(ltree, current_tpncp_data_field_info->tpncp_data_field_descr,
+ tvb, *offset, g_str_len, ENC_NA|ENC_ASCII);
(*offset) += g_str_len;
- g_free(g_str);
}
else { /* add single char */
g_uchar = tvb_get_guint8(tvb, *offset);