More bounds checking when fetching addresses and converting to strings.

[tcpdump] / print-nfs.c

diff --git a/print-nfs.c b/print-nfs.c
index d493cadec4056694646a8df3b5e619ce56c4d5a3..555a42dd5dc29132ac444f83d4284ccce18d07ef 100644 (file)
--- a/print-nfs.c
+++ b/print-nfs.c
@@ -209,14 +209,14 @@ print_nfsaddr(netdissect_options *ndo,
        switch (IP_V((const struct ip *)bp)) {
        case 4:
                ip = (const struct ip *)bp;
-               strlcpy(srcaddr, ipaddr_string(ndo, ip->ip_src), sizeof(srcaddr));
-               strlcpy(dstaddr, ipaddr_string(ndo, ip->ip_dst), sizeof(dstaddr));
+               strlcpy(srcaddr, GET_IPADDR_STRING(ip->ip_src), sizeof(srcaddr));
+               strlcpy(dstaddr, GET_IPADDR_STRING(ip->ip_dst), sizeof(dstaddr));
                break;
        case 6:
                ip6 = (const struct ip6_hdr *)bp;
-               strlcpy(srcaddr, ip6addr_string(ndo, ip6->ip6_src),
+               strlcpy(srcaddr, GET_IP6ADDR_STRING(ip6->ip6_src),
                    sizeof(srcaddr));
-               strlcpy(dstaddr, ip6addr_string(ndo, ip6->ip6_dst),
+               strlcpy(dstaddr, GET_IP6ADDR_STRING(ip6->ip6_dst),
                    sizeof(dstaddr));
                break;
        default: