From ec95db36a7ed4023f36e8316814c5e022843f287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Mon, 12 Oct 2009 08:16:50 +0000 Subject: Check for valid tree in proto_get_finfo_ptr_array() and proto_tracking_interesting_fields(). This fixes a crash when using Lua script without packet list coloring. svn path=/trunk/; revision=30532 --- epan/proto.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'epan/proto.c') diff --git a/epan/proto.c b/epan/proto.c index 9a7bc775ea..09c9fd88d6 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -5354,6 +5354,9 @@ proto_check_for_protocol_or_field(proto_tree* tree, int id) GPtrArray* proto_get_finfo_ptr_array(proto_tree *tree, int id) { + if (!tree) + return NULL; + if (PTREE_DATA(tree)->interesting_hfids != NULL) return g_hash_table_lookup(PTREE_DATA(tree)->interesting_hfids, GINT_TO_POINTER(id)); @@ -5364,6 +5367,9 @@ proto_get_finfo_ptr_array(proto_tree *tree, int id) gboolean proto_tracking_interesting_fields(proto_tree *tree) { + if (!tree) + return NULL; + return (PTREE_DATA(tree)->interesting_hfids != NULL); } -- cgit v1.2.3