More bounds checking when fetching addresses and converting to strings.

[tcpdump] / print-aoe.c

diff --git a/print-aoe.c b/print-aoe.c
index 5acab319765637eb6291fbab21d9e379b103165c..d8a5bc0533ab720c488d49a9910ba778e2cc114d 100644 (file)
--- a/print-aoe.c
+++ b/print-aoe.c
@@ -292,7 +292,7 @@ aoev1_mac_print(netdissect_options *ndo,
                cp += 1;
                /* Ethernet Address */
                ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
-               ND_PRINT(", Ethernet Address: %s", etheraddr_string(ndo, cp));
+               ND_PRINT(", Ethernet Address: %s", GET_ETHERADDR_STRING(cp));
                cp += MAC_ADDR_LEN;
        }
        return;
@@ -329,7 +329,7 @@ aoev1_reserve_print(netdissect_options *ndo,
        /* addresses */
        for (i = 0; i < nmacs; i++) {
                ND_TCHECK_LEN(cp, MAC_ADDR_LEN);
-               ND_PRINT("\n\tEthernet Address %u: %s", i, etheraddr_string(ndo, cp));
+               ND_PRINT("\n\tEthernet Address %u: %s", i, GET_ETHERADDR_STRING(cp));
                cp += MAC_ADDR_LEN;
        }
        return;