From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 11 Oct 2012 13:41:42 +0000 (+0000)
Subject: avoid race condition, also avoid a rare crash. Patch from ticket #596
X-Git-Tag: auth-3.2-rc1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9fa0e2de8c0c4a83a4104dfa3120c8e64f6c15b;p=thirdparty%2Fpdns.git

avoid race condition, also avoid a rare crash. Patch from ticket #596

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

diff --git a/pdns/slavecommunicator.cc b/pdns/slavecommunicator.cc
index aae39516a2..368433a4cb 100644
--- a/pdns/slavecommunicator.cc
+++ b/pdns/slavecommunicator.cc
@@ -577,8 +577,12 @@ void CommunicatorClass::slaveRefresh(PacketHandler *P)
   typedef DomainNotificationInfo val_t;
   BOOST_FOREACH(val_t& val, sdomains) {
     DomainInfo& di(val.di);
-    if(!di.backend) // might've come from the packethandler
-      B->getDomainInfo(di.zone, di);
+    // might've come from the packethandler
+    if(!di.backend && !B->getDomainInfo(di.zone, di)) {
+	L<<Logger::Warning<<"Ignore domain "<< di.zone<<" since it has been removed from our backend"<<endl;
+	continue;
+    }
+      
     if(!ssr.d_freshness.count(di.id)) 
       continue;
     uint32_t theirserial = ssr.d_freshness[di.id].theirSerial, ourserial = di.serial;