diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-11-02 15:21:52 +0100 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2017-11-02 14:57:50 +0000 |
commit | 78ee8c419fe7ef07a7ff90b5b763a96d406c215c (patch) | |
tree | ea3784f959b3b133d1f53b7c793f202c9fbe42da | |
parent | dd1f75a53ed113454fb7c6d1cfb3a9463da0ffb4 (diff) |
Do not register proto_reg_handoff_XXX callback when not required
None of those protocols need to be notified of a preference change and
their proto_reg_handoff_XXX functions do not differentiate the initial
call from susequent ones, leading to an assert
Bug: 14157
Change-Id: Iac4d88ebef7688bced8daae857eb5c836a6babd6
Reviewed-on: https://code.wireshark.org/review/24211
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r-- | epan/dissectors/packet-aeron.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ipdc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-aeron.c b/epan/dissectors/packet-aeron.c index 0f74f5ea7a..4da21f4a24 100644 --- a/epan/dissectors/packet-aeron.c +++ b/epan/dissectors/packet-aeron.c @@ -3083,7 +3083,7 @@ void proto_register_aeron(void) proto_register_subtree_array(ett, array_length(ett)); expert_aeron = expert_register_protocol(proto_aeron); expert_register_field_array(expert_aeron, ei, array_length(ei)); - aeron_module = prefs_register_protocol(proto_aeron, proto_reg_handoff_aeron); + aeron_module = prefs_register_protocol(proto_aeron, NULL); aeron_heuristic_subdissector_list = register_heur_dissector_list("aeron_msg_payload", proto_aeron); prefs_register_bool_preference(aeron_module, diff --git a/epan/dissectors/packet-ipdc.c b/epan/dissectors/packet-ipdc.c index 4e03269244..b575d899c7 100644 --- a/epan/dissectors/packet-ipdc.c +++ b/epan/dissectors/packet-ipdc.c @@ -1066,7 +1066,7 @@ proto_register_ipdc(void) expert_ipdc = expert_register_protocol(proto_ipdc); expert_register_field_array(expert_ipdc, ei, array_length(ei)); - ipdc_module = prefs_register_protocol(proto_ipdc, proto_reg_handoff_ipdc); + ipdc_module = prefs_register_protocol(proto_ipdc, NULL); prefs_register_bool_preference(ipdc_module, "desegment_ipdc_messages", "Reassemble IPDC messages spanning multiple TCP segments", "Whether the IPDC dissector should reassemble messages spanning multiple TCP segments." |