More bounds checking when fetching addresses and converting to strings.

[tcpdump] / print-rrcp.c

diff --git a/print-rrcp.c b/print-rrcp.c
index 4aaae6d97992b3fa1747aa66845d66bec104600f..e18885f6e3acf4ebe6810fbea034bc227fb9bf5c 100644 (file)
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -130,7 +130,7 @@ rrcp_print(netdissect_options *ndo,
            ND_PRINT(" downlink_port=%u, uplink_port=%u, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ",
                     GET_U_1(cp + RRCP_DOWNLINK_PORT_OFFSET),
                     GET_U_1(cp + RRCP_UPLINK_PORT_OFFSET),
-                    etheraddr_string(ndo, cp + RRCP_UPLINK_MAC_OFFSET),
+                    GET_ETHERADDR_STRING(cp + RRCP_UPLINK_MAC_OFFSET),
                     GET_BE_U_4(cp + RRCP_VENDOR_ID_OFFSET),
                     GET_BE_U_2(cp + RRCP_CHIP_ID_OFFSET));
        }else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){