From Colin O'Flynn:

Add a missing NULL pointer check.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34761 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 463b17f1d8117fe6c158948b6ae07cdbf391e404..000e92448d9f2db0c6847b61120c9968e7c557fe 100644 (file)
--- 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. */