Add another check, and fix a check.

[tcpdump] / print-cdp.c

diff --git a/print-cdp.c b/print-cdp.c
index a0cdf2a3fc3f1df17e51e82b011f7771098fa6fb..6b345e25c58bd6e00c2672f9fa8da6583772666c 100644 (file)
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -26,7 +26,7 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.23 2004-03-24 00:41:13 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-cdp.c,v 1.24 2004-03-24 05:59:16 guy Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -243,11 +243,12 @@ cdp_print_addr(const u_char * p, int l)
        };
 #endif
 
+       TCHECK2(*p, 2);
        num = EXTRACT_32BITS(p);
        p += 4;
 
        while (p < endp && num >= 0) {
-               TCHECK2(p, 2);
+               TCHECK2(*p, 2);
                if (p + 2 > endp)
                        goto trunc;
                pt = p[0];              /* type of "protocol" field */