aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2016-06-22 21:10:50 +0100
committerJoão Valverde <j@v6e.pt>2016-06-23 06:50:16 +0000
commitfdcfd3a6f367a94d00592ad4fd174c08b95a90c2 (patch)
tree24e4b13f262f2b4568c95705f853e082d00dee5a /epan
parent30f743496ea11c63bf0a9b2200a404d9902c6ac4 (diff)
IPv6: Don't check payload length for ICMPv6 encapsulation
Change-Id: I783df2ddc98da1c78020837a32005ea143321990 Reviewed-on: https://code.wireshark.org/review/16081 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-ipv6.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c
index 236e4dcd26..aa43606e2e 100644
--- a/epan/dissectors/packet-ipv6.c
+++ b/epan/dissectors/packet-ipv6.c
@@ -2442,7 +2442,7 @@ dissect_ipv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
}
return tvb_captured_length(tvb);
}
- if (plen > (tvb_reported_length(tvb) - 40)) {
+ if (!pinfo->flags.in_error_pkt && plen > (tvb_reported_length(tvb) - 40)) {
expert_add_info_format(pinfo, ti_ipv6_plen, &ei_ipv6_bogus_payload_length,
"IPv6 payload length exceeds framing length (%d bytes)",
tvb_reported_length(tvb) - 40);