From 7aaa0b2a2739c7fc1f01a4728b6e64032682f9a2 Mon Sep 17 00:00:00 2001 From: Chris Maynard Date: Fri, 13 Dec 2013 21:15:49 +0000 Subject: Return FALSE from dissect_zbee_nwk_heur() if data is NULL. svn path=/trunk/; revision=54064 --- epan/dissectors/packet-zbee-nwk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'epan/dissectors/packet-zbee-nwk.c') diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c index 88898114df..0cda7fc284 100644 --- a/epan/dissectors/packet-zbee-nwk.c +++ b/epan/dissectors/packet-zbee-nwk.c @@ -306,7 +306,8 @@ dissect_zbee_nwk_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void ieee802154_packet *packet = (ieee802154_packet *)data; /* All ZigBee frames must always have a 16-bit source address. */ - if (packet->src_addr_mode != IEEE802154_FCF_ADDR_SHORT) { + if ( (packet == NULL) || + (packet->src_addr_mode != IEEE802154_FCF_ADDR_SHORT) ) { return FALSE; } /* ZigBee MAC frames must always contain a 16-bit destination address. */ -- cgit v1.2.3