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/dissectors/asn1/pcap | |
| parent | 29a7fce2720288c86e474f68880a0e61e517027b (diff) | |
| download | wireshark-6a6d7ea34f43515dfe3f52aa96b943c272c925a7.tar.gz | |
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/dissectors/asn1/pcap')
| -rw-r--r-- | epan/dissectors/asn1/pcap/packet-pcap-template.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/asn1/pcap/packet-pcap-template.c b/epan/dissectors/asn1/pcap/packet-pcap-template.c index 7748a984dd..a3531de7ae 100644 --- a/epan/dissectors/asn1/pcap/packet-pcap-template.c +++ b/epan/dissectors/asn1/pcap/packet-pcap-template.c @@ -154,9 +154,9 @@ proto_reg_handoff_pcap(void) #include "packet-pcap-dis-tab.c" } else { dissector_delete_uint_range("sccp.ssn", ssn_range, pcap_handle); - 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); dissector_add_uint_range("sccp.ssn", ssn_range, pcap_handle); } @@ -202,7 +202,7 @@ void proto_register_pcap(void) { /* Preferences */ /* Set default SSNs */ - range_convert_str(&global_ssn_range, "", MAX_SSN); + range_convert_str(wmem_epan_scope(), &global_ssn_range, "", MAX_SSN); prefs_register_range_preference(pcap_module, "ssn", "SCCP SSNs", "SCCP (and SUA) SSNs to decode as PCAP", |