diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-13 20:59:45 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2013-12-13 20:59:45 +0000 |
| commit | 7ba2ee5d6e98b48b66633e894183a58ea1d839af (patch) | |
| tree | a2e79b392ca8e54f6ba00cef886e99ddcfe57222 | |
| parent | 305055b82934e3ce8f27d40a886fd536a9fbe0b7 (diff) | |
Return FALSE from dissect_tapa_heur() if data is NULL.
svn path=/trunk/; revision=54062
| -rw-r--r-- | epan/dissectors/packet-tapa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-tapa.c b/epan/dissectors/packet-tapa.c index 3974a3221e..39b42f87e3 100644 --- a/epan/dissectors/packet-tapa.c +++ b/epan/dissectors/packet-tapa.c @@ -480,7 +480,7 @@ dissect_tapa_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *dat ws_ip* iph = (ws_ip*)data; /* The TAPA protocol also uses IP protocol number 4 but it isn't really IPIP */ - if ((iph->ip_p == IP_PROTO_IPIP) && ((tvb_get_guint8(tvb, 0) & 0xF0) != 0x40) && + if (iph && (iph->ip_p == IP_PROTO_IPIP) && ((tvb_get_guint8(tvb, 0) & 0xF0) != 0x40) && (tvb_get_ntohs(tvb, 2)) < 20) { dissect_tapa_static(tvb, pinfo, tree, data); return TRUE; |