Improve bounds checking.

diff --git a/print-pppoe.c b/print-pppoe.c
index f0af6a13742e963b9f26c23e8225261c7ff4e30c..d450eebc1788eaeb893320a7b2fb26876605346d 100644 (file)
--- a/print-pppoe.c
+++ b/print-pppoe.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.24.2.3 2003-11-16 08:51:39 guy Exp $ (LBL)";
+"@(#) $Header: /tcpdump/master/tcpdump/print-pppoe.c,v 1.24.2.4 2004-03-24 03:04:22 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -105,11 +105,7 @@ pppoe_print(register const u_char *bp, u_int length)
        const u_char *pppoe_packet, *pppoe_payload;
 
        pppoe_packet = bp;
-       if (pppoe_packet > snapend) {
-               printf("[|pppoe]");
-               return (PPPOE_HDRLEN);
-       }
-
+       TCHECK2(*pppoe_packet, PPPOE_HDRLEN);
        pppoe_ver  = (pppoe_packet[0] & 0xF0) >> 4;
        pppoe_type  = (pppoe_packet[0] & 0x0F);
        pppoe_code = pppoe_packet[1];
@@ -215,4 +211,8 @@ pppoe_print(register const u_char *bp, u_int length)
                printf(" ");
                return (PPPOE_HDRLEN + ppp_print(pppoe_payload, pppoe_length));
        }
+
+trunc:
+       printf("[|pppoe]");
+       return (PPPOE_HDRLEN);
 }