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

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index c2f86ff48bb4fff277b16ffc4f51a1192cf8dff7..edbcd96d5997746bccf287a430df7a1d9782a1d8 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -21,12 +21,11 @@
 
 /* \summary: IPv6 routing header printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
@@ -67,6 +66,7 @@ srh_tlv_print(netdissect_options *ndo, const u_char *p, u_int bytes_left)
                case IPV6_SRH_TLV_PADN:
                        ND_ICHECKMSG_U("PadN length", tlv_len, >, 5); /* RFC 8754 */
                        ND_ICHECKMSG_U("remaining length", bytes_left, <, tlv_len);
+                       ND_TCHECK_LEN(p, tlv_len);
                        p += tlv_len;
                        bytes_left -= tlv_len;
                        break;
@@ -165,7 +165,6 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
                /*(*/
                ND_PRINT(") ");
                return((GET_U_1(dp0->ip6r0_len) + 1) << 3);
-               break;
        case IPV6_RTHDR_TYPE_4:
                srh = (const struct ip6_srh *)dp;
                last_entry = GET_U_1(srh->srh_last_ent);
@@ -195,7 +194,6 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
                /*(*/
                ND_PRINT(") ");
                return((GET_U_1(srh->srh_len) + 1) << 3);
-               break;
        default:
                ND_PRINT(" (unknown type)");
                goto invalid;