CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index 773e49ab5e4e9896d6ed7fb5f423358b1629385c..abc2a6367380927c6fe242c06b6f7a7df34717e2 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -25,6 +25,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
@@ -43,10 +44,16 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
        ND_PRINT("frag (");
        if (ndo->ndo_vflag)
                ND_PRINT("0x%08x:", GET_BE_U_4(dp->ip6f_ident));
-       ND_PRINT("%u|%zu)",
-                GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
-                sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) -
-                       (bp - bp2) - sizeof(struct ip6_frag));
+       else
+               ND_TCHECK_4(dp->ip6f_ident);
+       ND_PRINT("%u|", GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK);
+       if ((bp - bp2) + sizeof(struct ip6_frag) >
+           sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen))
+               ND_PRINT("[length < 0] (invalid))");
+       else
+               ND_PRINT("%zu)",
+                        sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) -
+                        (bp - bp2) - sizeof(struct ip6_frag));
 
        /* it is meaningless to decode non-first fragment */
        if ((GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)