CVE-2017-13687/CHDLC: Improve bounds and length checks.

[tcpdump] / print-lwres.c

diff --git a/print-lwres.c b/print-lwres.c
index f6252cbaf1f34963e9c78919a8a3cffaee8102ea..ae352807d006b2399e222b718eabf3dbfd24bbc2 100644 (file)
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -27,6 +27,8 @@
  * SUCH DAMAGE.
  */
 
+/* \summary: BIND9 Lightweight Resolver protocol printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -268,14 +270,12 @@ lwres_printaddr(netdissect_options *ndo,
                ND_PRINT((ndo, " %s", ipaddr_string(ndo, p)));
                p += sizeof(struct in_addr);
                break;
-#ifdef INET6
        case 2: /* IPv6 */
                if (l < 16)
                        return -1;
                ND_PRINT((ndo, " %s", ip6addr_string(ndo, p)));
                p += sizeof(struct in6_addr);
                break;
-#endif
        default:
                ND_PRINT((ndo, " %u/", EXTRACT_32BITS(&ap->family)));
                for (i = 0; i < l; i++)
@@ -542,7 +542,7 @@ lwres_print(netdissect_options *ndo,
                                    EXTRACT_16BITS(&grbn->rdclass))));
                        }
                        ND_PRINT((ndo, " TTL "));
-                       relts_print(ndo, EXTRACT_32BITS(&grbn->ttl));
+                       unsigned_relts_print(ndo, EXTRACT_32BITS(&grbn->ttl));
                        ND_PRINT((ndo, " %u/%u", EXTRACT_16BITS(&grbn->nrdatas),
                            EXTRACT_16BITS(&grbn->nsigs)));