From 6a6d7ea34f43515dfe3f52aa96b943c272c925a7 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Thu, 22 Dec 2016 15:12:27 -0500 Subject: Convert range API to always use wmem memory. This is mostly to address memory leaks in range preferences (the biggest user of range functionality) on shutdown. Now range preferences must use epan scoped memory when referencing internal preference structures to keep consistency. Change-Id: Idc644f59b5b42fa1d46891542b53ff13ea754157 Reviewed-on: https://code.wireshark.org/review/19387 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu Reviewed-by: Michael Mann --- epan/packet_range.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'epan/packet_range.c') diff --git a/epan/packet_range.c b/epan/packet_range.c index c688967af3..a6797e3110 100644 --- a/epan/packet_range.c +++ b/epan/packet_range.c @@ -229,7 +229,7 @@ void packet_range_init(packet_range_t *range, capture_file *cf) { memset(range, 0, sizeof(packet_range_t)); range->process = range_process_all; - range->user_range = range_empty(); + range->user_range = NULL; range->cf = cf; /* calculate all packet range counters */ @@ -343,11 +343,11 @@ void packet_range_convert_str(packet_range_t *range, const gchar *es) convert_ret_t ret; if (range->user_range != NULL) - g_free(range->user_range); + wmem_free(NULL, range->user_range); g_assert(range->cf != NULL); - ret = range_convert_str(&new_range, es, range->cf->count); + ret = range_convert_str(NULL, &new_range, es, range->cf->count); if (ret != CVT_NO_ERROR) { /* range isn't valid */ range->user_range = NULL; -- cgit v1.2.3