Merge branch 'master' into fix_udp_frag_badlen

diff --git a/print-udp.c b/print-udp.c
index b5254f0c85246f95db052d2aeda859aeb6fdcb60..961b6f8fb507d79a73051296470722a58d1f594b 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -740,14 +740,14 @@ udp_print(netdissect_options *ndo, const u_char *bp, u_int length,
                } else if (IS_SRC_OR_DST_PORT(SOMEIP_PORT))
                        someip_print(ndo, (const u_char *)(up + 1), length);
                else {
-                       if (ulen > length)
+                       if (ulen > length && !fragmented)
                                ND_PRINT("UDP, bad length %u > %u",
                                    ulen, length);
                        else
                                ND_PRINT("UDP, length %u", ulen);
                }
        } else {
-               if (ulen > length)
+               if (ulen > length && !fragmented)
                        ND_PRINT("UDP, bad length %u > %u",
                            ulen, length);
                else