aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2015-12-11 01:04:13 +0000
committerAnders Broman <a.broman58@gmail.com>2015-12-11 05:30:07 +0000
commite8b8568b7c5d0035a13b6f0dd93a5406ffff0b13 (patch)
tree5576539a73ae90f57b42333df9cdb5aa85450ad9 /epan
parentc5f1eed1a5b44f8404f1049e20161a80312936e0 (diff)
6LowPAN: Check for NHC IPv6 No Next Header
Bug: 11728 Change-Id: I7b7cc72b4200e53856283e0716383d661a16fa77 Reviewed-on: https://code.wireshark.org/review/12512 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-6lowpan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-6lowpan.c b/epan/dissectors/packet-6lowpan.c
index 812139be04..2f95e63b2d 100644
--- a/epan/dissectors/packet-6lowpan.c
+++ b/epan/dissectors/packet-6lowpan.c
@@ -2042,7 +2042,7 @@ dissect_6lowpan_iphc_nhc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gi
*/
nhdr->next = dissect_6lowpan_iphc_nhc(tvb, pinfo, tree, offset, dgram_size - ext_len - (int)sizeof(struct ip6_ext), siid, diid);
}
- else {
+ else if (ipv6_ext.ip6e_nxt != IP_PROTO_NONE) {
/* Create another next header structure for the remaining payload. */
length = (gint)tvb_ensure_captured_length_remaining(tvb, offset);
nhdr->next = (struct lowpan_nhdr *)wmem_alloc(wmem_packet_scope(), sizeof(struct lowpan_nhdr) + length);