diff options
| author | Michael Mann <mmann78@netscape.net> | 2016-12-22 15:12:27 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-01-07 00:44:10 +0000 |
| commit | 6a6d7ea34f43515dfe3f52aa96b943c272c925a7 (patch) | |
| tree | dbf89a2226861fa855cc04d80607c56f7268e51b /epan/packet.c | |
| parent | 29a7fce2720288c86e474f68880a0e61e517027b (diff) | |
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 <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/packet.c b/epan/packet.c index 56b64e62b8..174814ae72 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -1051,8 +1051,7 @@ void dissector_add_uint_range_with_preference(const char *abbrev, const char* ra table value would default to 0. Set up a preference value with that information */ - range = wmem_new(wmem_epan_scope(), range_t*); - *range = range_empty(); + range = wmem_new0(wmem_epan_scope(), range_t*); /* If the dissector already has a preference module, use it */ module = prefs_find_module(proto_get_protocol_filter_name(proto_id)); @@ -1089,7 +1088,7 @@ void dissector_add_uint_range_with_preference(const char *abbrev, const char* ra g_assert_not_reached(); } - range_convert_str(range, range_str, max_value); + range_convert_str(wmem_epan_scope(), range, range_str, max_value); prefs_register_decode_as_range_preference(module, abbrev, title, description, range, max_value); } |