diff options
Diffstat (limited to 'epan/dissectors/packet-icmp.c')
| -rw-r--r-- | epan/dissectors/packet-icmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c index 7b8d8d9d59..580ca9b926 100644 --- a/epan/dissectors/packet-icmp.c +++ b/epan/dissectors/packet-icmp.c @@ -1788,7 +1788,7 @@ dissect_icmp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data) if ((tvb_reported_length(tvb) > 8 + 128) && (tvb_get_ntohs(tvb, 8 + 2) <= 128 || favor_icmp_mpls_ext)) { - int ext_offset = (icmp_original_dgram_length ? icmp_original_dgram_length * 4 : 128) + 8; + int ext_offset = MAX(icmp_original_dgram_length * 4, 128) + 8; tvbuff_t * extension_tvb = tvb_new_subset_remaining(tvb, ext_offset); dissect_icmp_extension(extension_tvb, pinfo, icmp_tree, NULL); } |