summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2017-02-01 15:11:15 +0100
committerMichael Mann <mmann78@netscape.net>2017-02-01 18:16:07 +0000
commited6c961441f5f070e60b5c708f1736abc947adde (patch)
treeb83f98a399839f3e2a500bab3de62defc500a2a7
parent226377fa8c39496b2e5cb2f9e7b6642cb61dc706 (diff)
downloadwireshark-ed6c961441f5f070e60b5c708f1736abc947adde.tar.gz
frame: use wmem instead of glib allocator.
Change-Id: Ibed5c2418d1dd400fe586d40681fb5ba90efbd9f Reviewed-on: https://code.wireshark.org/review/19906 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/dissectors/packet-frame.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c
index 509c8ca2c7..5f42b7bb60 100644
--- a/epan/dissectors/packet-frame.c
+++ b/epan/dissectors/packet-frame.c
@@ -40,6 +40,7 @@
#include <epan/expert.h>
#include <wsutil/md5.h>
#include <wsutil/str_util.h>
+#include <wmem/wmem.h>
#include "packet-frame.h"
#include "log.h"
@@ -913,7 +914,7 @@ proto_register_frame(void)
value_string *arr;
int i;
- hf_encap.hfinfo.strings = arr = g_new(value_string, encap_count+1);
+ hf_encap.hfinfo.strings = arr = wmem_alloc_array(wmem_epan_scope(), value_string, encap_count+1);
for (i = 0; i < encap_count; i++) {
arr[i].value = i;