X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/96c60029b3f935eff892d1f49b52f305423e4671..refs/pull/1034/head:/print-null.c

diff --git a/print-null.c b/print-null.c
index 1edff6af..a1b03f86 100644
--- a/print-null.c
+++ b/print-null.c
@@ -27,8 +27,7 @@
 
 #include "netdissect-stdinc.h"
 
-#include <string.h>
-
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 #include "af.h"
@@ -82,11 +81,7 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 	uint32_t family;
 
 	ndo->ndo_protocol = "null";
-	if (caplen < NULL_HDRLEN) {
-		ndo->ndo_ll_hdr_len += caplen;
-		nd_print_trunc(ndo);
-		return;
-	}
+	ND_TCHECK_LEN(p, NULL_HDRLEN);
 	ndo->ndo_ll_hdr_len += NULL_HDRLEN;
 
 	family = GET_HE_U_4(p);
@@ -140,6 +135,4 @@ null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char
 		if (!ndo->ndo_suppress_default_print)
 			ND_DEFAULTPRINT(p, caplen);
 	}
-
-	return;
 }