More bounds checking when fetching addresses and converting to strings.

[tcpdump] / print-mobility.c

diff --git a/print-mobility.c b/print-mobility.c
index 329f84a8b76f106b116a971bd887bb1031bea552..cdb431678a459c856045b93039445c8a2347ff2d 100644 (file)
--- a/print-mobility.c
+++ b/print-mobility.c
@@ -159,7 +159,7 @@ mobility_opt_print(netdissect_options *ndo,
                                goto trunc;
                        }
                        ND_TCHECK_16(bp + i + 2);
-                       ND_PRINT("(alt-CoA: %s)", ip6addr_string(ndo, bp + i + 2));
+                       ND_PRINT("(alt-CoA: %s)", GET_IP6ADDR_STRING(bp + i + 2));
                        break;
                case IP6MOPT_NONCEID:
                        if (len - i < IP6MOPT_NONCEID_MINLEN) {
@@ -326,7 +326,7 @@ mobility_print(netdissect_options *ndo,
                /* Reserved */
                hlen = IP6M_MINLEN;
                ND_TCHECK_16(bp + hlen);
-               ND_PRINT(" homeaddr %s", ip6addr_string(ndo, bp + hlen));
+               ND_PRINT(" homeaddr %s", GET_IP6ADDR_STRING(bp + hlen));
                hlen += 16;
                break;
        default: