diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-13 21:15:49 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-13 21:15:49 +0000 |
| commit | 7aaa0b2a2739c7fc1f01a4728b6e64032682f9a2 (patch) | |
| tree | 5ac91e932be89edd2b5917709b938eba790bae61 /epan/dissectors/packet-zbee-nwk.c | |
| parent | 629c13c51d96781c98a660f945ba6cd41fd3de51 (diff) | |
Return FALSE from dissect_zbee_nwk_heur() if data is NULL.
svn path=/trunk/; revision=54064
Diffstat (limited to 'epan/dissectors/packet-zbee-nwk.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-nwk.c | 3 |
1 files changed, 2 insertions, 1 deletions
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. */ |