More bounds checking when fetching addresses and converting to strings.

[tcpdump] / print-rt6.c

diff --git a/print-rt6.c b/print-rt6.c
index 703011064c116c47d3c9812cc2ba707651278ccd..a6886f94c834e190c44d7e1c41789ea6c181945a 100644 (file)
--- a/print-rt6.c
+++ b/print-rt6.c
@@ -72,7 +72,7 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
                p = (const u_char *) dp0->ip6r0_addr;
                for (i = 0; i < len; i++) {
                        ND_TCHECK_16(p);
-                       ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p));
+                       ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
                        p += 16;
                }
                /*(*/
@@ -99,7 +99,7 @@ rt6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2 _U_)
                p  = (const u_char *) srh->srh_segments;
                for (i = 0; i < len; i++) {
                        ND_TCHECK_16(p);
-                       ND_PRINT(", [%u]%s", i, ip6addr_string(ndo, p));
+                       ND_PRINT(", [%u]%s", i, GET_IP6ADDR_STRING(p));
                        p += 16;
                }
                /*(*/