From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Thu, 14 Sep 2017 08:08:54 +0000 (+0200)
Subject: verify parts.size(). Fixes #5688
X-Git-Tag: rec-4.1.0-rc1~42^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82ffc6cead5fb09725ce75565c5049e29d1f03e4;p=thirdparty%2Fpdns.git

verify parts.size(). Fixes #5688
---

diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc
index 6123c9ca53..c3213712d7 100644
--- a/pdns/pdnsutil.cc
+++ b/pdns/pdnsutil.cc
@@ -584,16 +584,16 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const DNSName& zone, const vect
       if (rr.qtype.getCode() == QType::SRV) {
         vector<string> parts;
         stringtok(parts, rr.getZoneRepresentation());
-        toCheck = DNSName(parts[3]);
+        if (parts.size() == 4) toCheck = DNSName(parts[3]);
       } else if (rr.qtype.getCode() == QType::MX) {
         vector<string> parts;
         stringtok(parts, rr.getZoneRepresentation());
-        toCheck = DNSName(parts[1]);
+        if (parts.size() == 2) toCheck = DNSName(parts[1]);
       } else {
         toCheck = DNSName(rr.content);
       }
 
-      if (!toCheck.isHostname()) {
+      if (!toCheck.empty() && !toCheck.isHostname()) {
         cout<<"[Warning] "<<rr.qtype.getName()<<" record in zone '"<<zone<<"' has non-hostname content '"<<toCheck<<"'."<<endl;
         numwarnings++;
       }