More bounds checking when fetching addresses and converting to strings.

[tcpdump] / print-lldp.c

diff --git a/print-lldp.c b/print-lldp.c
index a578f4ea133b7fdebf6bc886acb1b55d53bcc219..54745e5b7b1161cfeb74b56ddb36bd3e1169903b 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -1495,7 +1495,7 @@ lldp_print(netdissect_options *ndo,
                     if (tlv_len < 1+6) {
                         goto trunc;
                     }
-                    ND_PRINT("%s", etheraddr_string(ndo, tptr + 1));
+                    ND_PRINT("%s", GET_ETHERADDR_STRING(tptr + 1));
                     break;
 
                 case LLDP_CHASSIS_INTF_NAME_SUBTYPE: /* fall through */
@@ -1536,7 +1536,7 @@ lldp_print(netdissect_options *ndo,
                     if (tlv_len < 1+6) {
                         goto trunc;
                     }
-                    ND_PRINT("%s", etheraddr_string(ndo, tptr + 1));
+                    ND_PRINT("%s", GET_ETHERADDR_STRING(tptr + 1));
                     break;
 
                 case LLDP_PORT_INTF_NAME_SUBTYPE: /* fall through */