aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2016-04-14 16:41:06 +0200
committerAnders Broman <a.broman58@gmail.com>2016-04-15 10:44:29 +0000
commit72444b7d1c2de7c0ed218e5cb264466b7fd3010c (patch)
tree0078bd9fb642738c9146e5a7765956fc6867e8ec /epan
parentd6f69751c00f50e29f6f46d37b673522ded51437 (diff)
gtp: change g_malloc to wmem_alloc.
Change-Id: I0e8ce74f8b656e9e5b4db1fac4a562dcd7856ab2 Reviewed-on: https://code.wireshark.org/review/14919 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-gtp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c
index 457e944d20..6057f1fa87 100644
--- a/epan/dissectors/packet-gtp.c
+++ b/epan/dissectors/packet-gtp.c
@@ -8512,7 +8512,7 @@ dissect_gtp_common(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
/* No. Attach that information to the conversation, and add
* it to the list of information structures.
*/
- gtp_info = (gtp_conv_info_t *)g_malloc(sizeof(gtp_conv_info_t));
+ gtp_info = (gtp_conv_info_t *)wmem_alloc(wmem_file_scope(), sizeof(gtp_conv_info_t));
/*Request/response matching tables*/
gtp_info->matched = g_hash_table_new(gtp_sn_hash, gtp_sn_equal_matched);
gtp_info->unmatched = g_hash_table_new(gtp_sn_hash, gtp_sn_equal_unmatched);
@@ -8964,7 +8964,6 @@ gtp_cleanup(void)
gtp_info->unmatched=NULL;
next = gtp_info->next;
- g_free(gtp_info);
gtp_info = next;
}