X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/07a7f33ba3ff346b9ce31772645a06980baca907..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/print-otv.c

diff --git a/print-otv.c b/print-otv.c
index dbcef9f6..a0fe9d0e 100644
--- a/print-otv.c
+++ b/print-otv.c
@@ -23,6 +23,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
@@ -47,19 +48,18 @@ otv_print(netdissect_options *ndo, const u_char *bp, u_int len)
 
     ndo->ndo_protocol = "otv";
     ND_PRINT("OTV, ");
-    if (len < OTV_HDR_LEN)
-        goto trunc;
+    if (len < OTV_HDR_LEN) {
+        ND_PRINT("[length %u < %u]", len, OTV_HDR_LEN);
+        goto invalid;
+    }
 
-    ND_TCHECK_1(bp);
     flags = GET_U_1(bp);
     ND_PRINT("flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags);
     bp += 1;
 
-    ND_TCHECK_3(bp);
     ND_PRINT("overlay %u, ", GET_BE_U_3(bp));
     bp += 3;
 
-    ND_TCHECK_3(bp);
     ND_PRINT("instance %u\n", GET_BE_U_3(bp));
     bp += 3;
 
@@ -70,6 +70,7 @@ otv_print(netdissect_options *ndo, const u_char *bp, u_int len)
     ether_print(ndo, bp, len - OTV_HDR_LEN, ND_BYTES_AVAILABLE_AFTER(bp), NULL, NULL);
     return;
 
-trunc:
-    nd_print_trunc(ndo);
+invalid:
+    nd_print_invalid(ndo);
+    ND_TCHECK_LEN(bp, len);
 }