Reject the packet if data is NULL.

svn path=/trunk/; revision=53893

1 files changed, 6 insertions, 1 deletions

diff --git a/epan/dissectors/packet-zbee-zcl.c b/epan/dissectors/packet-zbee-zcl.c
index 0943df6fe8..0901efaded 100644
--- a/epan/dissectors/packet-zbee-zcl.c
+++ b/epan/dissectors/packet-zbee-zcl.c
@@ -952,7 +952,7 @@ static int dissect_zbee_zcl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     proto_item  *proto_root = NULL;
     proto_item  *ti;
 
-    zbee_nwk_packet *nwk = (zbee_nwk_packet *)data;
+    zbee_nwk_packet *nwk;
     zbee_zcl_packet packet;
     zbee_zcl_cluster_desc *desc;
 
@@ -960,6 +960,11 @@ static int dissect_zbee_zcl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     guint   offset = 0;
     guint   i;
 
+    /* Reject the packet if data is NULL */
+    if (data == NULL)
+        return 0;
+    nwk = (zbee_nwk_packet *)data;
+
     /* Init. */
     memset(&packet, 0, sizeof(zbee_zcl_packet));