From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Fri, 5 Jan 2018 21:17:49 +0000 (+0100)
Subject: bindbackend: handle std::exception during startup zone-parsing
X-Git-Tag: dnsdist-1.3.0~121^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=050700892baabc64fdb19638e07e46b2879cac9a;p=thirdparty%2Fpdns.git

bindbackend: handle std::exception during startup zone-parsing
---

diff --git a/modules/bindbackend/bindbackend2.cc b/modules/bindbackend/bindbackend2.cc
index 86159c424d..c3b9c8c016 100644
--- a/modules/bindbackend/bindbackend2.cc
+++ b/modules/bindbackend/bindbackend2.cc
@@ -882,6 +882,18 @@ void Bind2Backend::loadConfig(string* status)
             L<<Logger::Warning<<d_logprefix<<msg.str()<<endl;
             rejected++;
           }
+          catch(std::exception &ae) {
+            ostringstream msg;
+            msg<<" error at "+nowTime()+" parsing '"<<i->name<<"' from file '"<<i->filename<<"': "<<ae.what();
+
+            if(status)
+              *status+=msg.str();
+            bbd.d_status=msg.str();
+
+            L<<Logger::Warning<<d_logprefix<<msg.str()<<endl;
+            cerr << msg.str() << endl;
+            rejected++;
+          }
 	  safePutBBDomainInfo(bbd);
 	  
         }