diff options
| -rw-r--r-- | epan/dissectors/packet-ppp.c | 1 | ||||
| -rw-r--r-- | ui/decode_as_utils.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index b9d2b0893f..dfa923a76a 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -7446,6 +7446,7 @@ proto_register_iphc_crtp(void) proto_iphc_crtp_cudp16 = proto_register_protocol("CRTP (CUDP 16)", "CRTP (CUDP 16)", "crtp_cudp16"); proto_iphc_crtp_cudp8 = proto_register_protocol("CRTP (CUDP 8)", "CRTP (CUDP 8)", "crtp_cudp8"); proto_iphc_crtp_cs = proto_register_protocol("CRTP (CS)", "CRTP (CS)", "crtp_cs"); + proto_iphc_crtp_cntcp = proto_register_protocol("CRTP (CNTCP)", "CRTP (CNTCP)", "crtp_cntcp"); proto_register_field_array(proto_iphc_crtp, hf, array_length(hf)); proto_register_subtree_array(ett, array_length(ett)); diff --git a/ui/decode_as_utils.c b/ui/decode_as_utils.c index 22ff62ab26..6a6f25fe4a 100644 --- a/ui/decode_as_utils.c +++ b/ui/decode_as_utils.c @@ -80,7 +80,8 @@ change_dissector_if_matched(gpointer item, gpointer user_data) { dissector_handle_t handle = (dissector_handle_t)item; lookup_entry_t * lookup = (lookup_entry_t *)user_data; - if (strcmp(lookup->dissector_short_name, dissector_handle_get_short_name(handle)) == 0) { + const gchar *proto_short_name = dissector_handle_get_short_name(handle); + if (proto_short_name && strcmp(lookup->dissector_short_name, proto_short_name) == 0) { lookup->handle = handle; } } |