do not warn about extra lines in stderr if there is a stderr file that was compared

[tcpdump] / print-ppi.c

diff --git a/print-ppi.c b/print-ppi.c
index 72cd1b867fd502b9b5699f1ee669a0f10011aed6..66b7582150155bba77989057232d34dbb794868d 100644 (file)
--- a/print-ppi.c
+++ b/print-ppi.c
@@ -68,6 +68,7 @@ ppi_print(netdissect_options *ndo,
        }
 
        hdr = (const ppi_header_t *)p;
+       ND_TCHECK_16BITS(&hdr->ppi_len);
        len = EXTRACT_LE_16BITS(&hdr->ppi_len);
        if (caplen < len) {
                /*
@@ -81,6 +82,7 @@ ppi_print(netdissect_options *ndo,
                ND_PRINT((ndo, "[|ppi]"));
                return (len);
        }
+       ND_TCHECK_32BITS(&hdr->ppi_dlt);
        dlt = EXTRACT_LE_32BITS(&hdr->ppi_dlt);
 
        if (ndo->ndo_eflag)
@@ -104,6 +106,8 @@ ppi_print(netdissect_options *ndo,
                hdrlen = 0;
        }
        return (len + hdrlen);
+trunc:
+       return (caplen);
 }
 
 /*