X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/6288c273b66fa124b58af66026151fff1d5931c2..refs/pull/1034/head:/print-null.c diff --git a/print-null.c b/print-null.c index dea50ac2..a1b03f86 100644 --- a/print-null.c +++ b/print-null.c @@ -27,8 +27,7 @@ #include "netdissect-stdinc.h" -#include - +#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);