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>

1 files changed, 3 insertions, 3 deletions

diff --git a/epan/dissectors/asn1/inap/packet-inap-template.c b/epan/dissectors/asn1/inap/packet-inap-template.c
index 626013fae2..16b7e543f5 100644
--- a/epan/dissectors/asn1/inap/packet-inap-template.c
+++ b/epan/dissectors/asn1/inap/packet-inap-template.c
@@ -185,10 +185,10 @@ void proto_reg_handoff_inap(void) {
   }
   else {
     range_foreach(ssn_range, range_delete_callback);
-    g_free(ssn_range);
+    wmem_free(wmem_epan_scope(), ssn_range);
   }
 
-  ssn_range = range_copy(global_ssn_range);
+  ssn_range = range_copy(wmem_epan_scope(), global_ssn_range);
 
   range_foreach(ssn_range, range_add_callback);
 
@@ -244,7 +244,7 @@ void proto_register_inap(void) {
   register_ber_oid_dissector("0.4.0.1.1.1.0.0", dissect_inap, proto_inap, "cs1-ssp-to-scp");
 
   /* Set default SSNs */
-  range_convert_str(&global_ssn_range, "106,241", MAX_SSN);
+  range_convert_str(wmem_epan_scope(), &global_ssn_range, "106,241", MAX_SSN);
 
   inap_module = prefs_register_protocol(proto_inap, proto_reg_handoff_inap);