summaryrefslogtreecommitdiff
path: root/plugins/irda/packet-sir.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2016-07-20 23:54:35 +0200
committerAnders Broman <a.broman58@gmail.com>2016-07-22 06:21:54 +0000
commit53de2c23783788d92dc17d3dccfdc8b65ab0bf74 (patch)
tree2395270e27575e7261eda4bc9118daed12b69f90 /plugins/irda/packet-sir.c
parentb2e4a7e21ce7ee8fee857ee71d51ad1ec13feb2e (diff)
downloadwireshark-53de2c23783788d92dc17d3dccfdc8b65ab0bf74.tar.gz
Convert more glib memory to wmem pinfo pool
Change-Id: I4cc23bc19a6bd8c6a8e0389eaf939dbb60fe0ca3 Reviewed-on: https://code.wireshark.org/review/16562 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'plugins/irda/packet-sir.c')
-rw-r--r--plugins/irda/packet-sir.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/irda/packet-sir.c b/plugins/irda/packet-sir.c
index 11188a47bf..13534a7c5f 100644
--- a/plugins/irda/packet-sir.c
+++ b/plugins/irda/packet-sir.c
@@ -80,7 +80,7 @@ unescape_data(tvbuff_t *tvb, packet_info *pinfo)
} else {
guint length = tvb_captured_length(tvb);
guint offset;
- guint8 *data = (guint8 *)g_malloc(length);
+ guint8 *data = (guint8 *)wmem_alloc(pinfo->pool, length);
guint8 *dst = data;
tvbuff_t *next_tvb;
@@ -93,7 +93,6 @@ unescape_data(tvbuff_t *tvb, packet_info *pinfo)
}
next_tvb = tvb_new_child_real_data(tvb, data, (guint) (dst-data), (guint) (dst-data));
- tvb_set_free_cb(next_tvb, g_free);
add_new_data_source(pinfo, next_tvb, "Unescaped SIR");
return next_tvb;
}