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/packet-tpkt.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/dissectors/packet-tpkt.c')
| -rw-r--r-- | epan/dissectors/packet-tpkt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c index bed73e91ce..937769c175 100644 --- a/epan/dissectors/packet-tpkt.c +++ b/epan/dissectors/packet-tpkt.c @@ -659,7 +659,7 @@ proto_register_tpkt(void) "To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &tpkt_desegment); - range_convert_str(&tpkt_tcp_port_range, DEFAULT_TPKT_PORT_RANGE, MAX_TCP_PORT); + range_convert_str(wmem_epan_scope(), &tpkt_tcp_port_range, DEFAULT_TPKT_PORT_RANGE, MAX_TCP_PORT); prefs_register_range_preference(tpkt_module, "tcp.ports", "TPKT TCP ports", "TCP ports to be decoded as TPKT (default: " @@ -670,12 +670,15 @@ proto_register_tpkt(void) void proto_reg_handoff_tpkt(void) { - static range_t *port_range; + static range_t *port_range = NULL; osi_tp_handle = find_dissector("ositp"); dissector_add_uint_range_with_preference("tcp.port", TCP_PORT_TPKT_RANGE, tpkt_handle); - port_range = range_copy(tpkt_tcp_port_range); + dissector_delete_uint_range("tcp.port", port_range, tpkt_handle); + wmem_free(wmem_epan_scope(), port_range); + + port_range = range_copy(wmem_epan_scope(), tpkt_tcp_port_range); dissector_add_uint_range("tcp.port", port_range, tpkt_handle); /* |