More bounds checking when fetching addresses and converting to strings.

[tcpdump] / print-vqp.c

diff --git a/print-vqp.c b/print-vqp.c
index b0fba902039ef003bf8884efc44984c82b768223..e120de16b7b8e64897353865d6ccc14d2363d1d2 100644 (file)
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -181,7 +181,7 @@ vqp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
        case VQP_OBJ_IP_ADDRESS:
             if (vqp_obj_len != 4)
                 goto trunc;
-            ND_PRINT("%s (0x%08x)", ipaddr_string(ndo, tptr),
+            ND_PRINT("%s (0x%08x)", GET_IPADDR_STRING(tptr),
                      GET_BE_U_4(tptr));
             break;
             /* those objects have similar semantics - fall through */
@@ -196,7 +196,7 @@ vqp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
        case VQP_OBJ_MAC_NULL:
             if (vqp_obj_len != MAC_ADDR_LEN)
                 goto trunc;
-             ND_PRINT("%s", etheraddr_string(ndo, tptr));
+             ND_PRINT("%s", GET_ETHERADDR_STRING(tptr));
               break;
         default:
             if (ndo->ndo_vflag <= 1)