diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2010-11-03 17:52:11 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2010-11-03 17:52:11 +0000 |
| commit | 605db4842dfb4c0f812370f5c28aa9d0da3542e9 (patch) | |
| tree | 1795848db75a354d8817c22e2bfbd1cb07ab7260 /epan/dissectors/packet-ieee802154.c | |
| parent | 606cb44a24c01a91b6e005a5974c8b5b0b9a14f5 (diff) | |
From Colin O'Flynn:
Add a missing NULL pointer check.
svn path=/trunk/; revision=34761
Diffstat (limited to 'epan/dissectors/packet-ieee802154.c')
| -rw-r--r-- | epan/dissectors/packet-ieee802154.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c index 463b17f1d8..000e92448d 100644 --- a/epan/dissectors/packet-ieee802154.c +++ b/epan/dissectors/packet-ieee802154.c @@ -820,8 +820,7 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g if ( ((packet->src_addr_mode == IEEE802154_FCF_ADDR_SHORT) || (packet->src_addr_mode == IEEE802154_FCF_ADDR_EXT)) && ((packet->dst_addr_mode == IEEE802154_FCF_ADDR_NONE) || (!packet->intra_pan)) ) { /* Source PAN is present, extract it and add it to the tree. */ - ieee_hints->src_pan = packet->src_pan = tvb_get_letohs(tvb, offset); - + packet->src_pan = tvb_get_letohs(tvb, offset); if (tree) { proto_tree_add_uint(ieee802154_tree, hf_ieee802154_src_panID, tvb, offset, 2, packet->src_pan); } @@ -829,7 +828,11 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g } else { /* Set the panID field in case the intra-pan condition was met. */ - ieee_hints->src_pan = packet->src_pan = packet->dst_pan; + packet->src_pan = packet->dst_pan; + } + + if (ieee_hints) { + ieee_hints->src_pan = packet->src_pan; } /* Get short source address if present. */ |