Merge pull request #3272 from pieterlexis/3.4-zone2sql-crash-on-broke…

…n-soa ZoneParser: Throw PDNSException on too many SOA data elements
PowerDNS · Feb 2, 2016 · 0821425 · 0821425
2 parents 5b06f55 + 428ac83
commit 0821425
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/pdns/zoneparser-tng.cc b/pdns/zoneparser-tng.cc
@@ -428,6 +428,8 @@ bool ZoneParserTNG::get(DNSResourceRecord& rr, std::string* comment)
 
   case QType::SOA:
     stringtok(recparts, rr.content);
+    if(recparts.size() > 7)
+      throw PDNSException("SOA record contents for "+rr.qname+" contains too many parts");
     if(recparts.size() > 1) {
       recparts[0]=toCanonic(d_zonename, recparts[0]);
       recparts[1]=toCanonic(d_zonename, recparts[1]);