From: Bert Hubert <bert.hubert@netherlabs.nl>
Date: Fri, 25 Mar 2011 09:53:09 +0000 (+0000)
Subject: catch DNS parsing errors in incoming AXFRs and don't crash on them.
X-Git-Tag: auth-3.0~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75ccb5b95766e6bf24f033a27977b20c6b57a8fb;p=pdns

catch DNS parsing errors in incoming AXFRs and don't crash on them.


git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@2098 d19b8d6e-7fed-0310-83ef-9ca221ded41b
---

diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index a03308c43..60f8c24eb 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -208,6 +208,13 @@ void CommunicatorClass::suck(const string &domain,const string &remote)
       di.backend->abortTransaction();
     }
   }
+  catch(MOADNSException &re) {
+    L<<Logger::Error<<"Unable to parse record during incoming AXFR of '"+domain+"': "<<re.what()<<endl;
+    if(di.backend && !first) {
+      L<<Logger::Error<<"Aborting possible open transaction for domain '"<<domain<<"' AXFR"<<endl;
+      di.backend->abortTransaction();
+    }
+  }
   catch(ResolverException &re) {
     L<<Logger::Error<<"Unable to AXFR zone '"+domain+"' from remote '"<<remote<<"': "<<re.reason<<endl;
     if(di.backend && !first) {