From 6f4681034ef574f8a9b0d77af82fc7bf91692923 Mon Sep 17 00:00:00 2001 From: Simon Kelley Date: Sun, 26 Jan 2014 23:39:17 +0000 Subject: [PATCH] Code tidy. --- src/dnssec.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/dnssec.c b/src/dnssec.c index f021d2d..089d1a5 100644 --- a/src/dnssec.c +++ b/src/dnssec.c @@ -795,18 +795,16 @@ int dnssec_validate_by_ds(time_t now, struct dns_header *header, size_t plen, ch GETSHORT(qclass, p); GETLONG(ttl, p); GETSHORT(rdlen, p); - - if (qclass != class || qtype != T_DNSKEY || rc == 2) - { - if (ADD_RDLEN(header, p, plen, rdlen)) - continue; - - return STAT_INSECURE; /* bad packet */ - } - + if (!CHECK_LEN(header, p, plen, rdlen) || rdlen < 4) return STAT_INSECURE; /* bad packet */ + if (qclass != class || qtype != T_DNSKEY || rc == 2) + { + p += rdlen; + continue; + } + psave = p; GETSHORT(flags, p); -- 2.39.5