X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c845af56663580bd38ace3dedfd83f0a9e7cbcb4..cebc5988bdde08a21714f66479bf9a6a5150d2da:/print-cdp.c

diff --git a/print-cdp.c b/print-cdp.c
index 62eeed45..0e88929b 100644
--- a/print-cdp.c
+++ b/print-cdp.c
@@ -213,7 +213,7 @@ struct cdp_tlvinfo {
 static const struct cdp_tlvinfo cdptlvs[] = {
 	/* 0x00 */
 	[ 0x01 ] = { "Device-ID", cdp_print_string, VERBOSE_OR_NOT_VERBOSE, -1, -1 },
-	[ 0x02 ] = { "Address", cdp_print_addr, VERBOSE_ONLY, -1, -1 },
+	[ 0x02 ] = { "Address", cdp_print_addr, VERBOSE_ONLY, 4, -1 },
 	[ 0x03 ] = { "Port-ID", cdp_print_string, VERBOSE_ONLY, -1, -1 },
 	[ 0x04 ] = { "Capability", cdp_print_capability, VERBOSE_ONLY, 4, 4 },
 	[ 0x05 ] = { "Version String", cdp_print_version, VERBOSE_ONLY, -1, -1 },
@@ -375,10 +375,6 @@ cdp_print_addr(netdissect_options *ndo,
 		0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 0x86, 0xdd
 	};
 
-	if (l < 4) {
-		ND_PRINT(" (not enough space for num)");
-		goto invalid;
-	}
 	num = GET_BE_U_4(p);
 	p += 4;
 	l -= 4;