aboutsummaryrefslogtreecommitdiffstats
path: root/epan/proto.c
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-12-16 21:51:33 -0500
committerRoland Knall <rknall@gmail.com>2017-12-19 08:21:19 +0000
commit0d6eb9631f26176d00d6bef69569d1d2911bd233 (patch)
tree97ae18832c54a74ed94ecc17e3f102d45e7a5680 /epan/proto.c
parent6e4a6364154f4e880f2bb6111d6759e51a686bb4 (diff)
Convert Enabled protocols dialog to use model.
Change-Id: I618df2f2608adcd1be5da02262c5296e4d86cfba Reviewed-on: https://code.wireshark.org/review/24866 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'epan/proto.c')
-rw-r--r--epan/proto.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/epan/proto.c b/epan/proto.c
index e3864f7304..ac653c23c8 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -6886,6 +6886,9 @@ proto_is_pino(const protocol_t *protocol)
gboolean
proto_is_protocol_enabled(const protocol_t *protocol)
{
+ if (protocol == NULL)
+ return FALSE;
+
//parent protocol determines enable/disable for helper dissectors
if (proto_is_pino(protocol))
return proto_is_protocol_enabled(find_protocol_by_id(protocol->parent_proto_id));