From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 16 Sep 2019 10:35:36 +0000 (+0200)
Subject: auth: on luaSynth exception, drain db output. Fixes #8299
X-Git-Tag: auth-4.3.0-alpha1~36^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c1627f2f2543451b5410401ebe93edbdd591d1c;p=thirdparty%2Fpdns.git

auth: on luaSynth exception, drain db output. Fixes #8299
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 3455695263..f1d4f28738 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -389,12 +389,19 @@ bool PacketHandler::getBestWildcard(DNSPacket& p, const SOAData& sd, const DNSNa
         if(rec->d_type == QType::CNAME || rec->d_type == p.qtype.getCode() || (p.qtype.getCode() == QType::ANY && rec->d_type != QType::RRSIG)) {
           //    noCache=true;
           DLOG(g_log<<"Executing Lua: '"<<rec->getCode()<<"'"<<endl);
-          auto recvec=luaSynth(rec->getCode(), target, sd.qname, sd.domain_id, p, rec->d_type);
-          for(const auto& r : recvec) {
-            rr.dr.d_type = rec->d_type; // might be CNAME
-            rr.dr.d_content = r;
-            rr.scopeMask = p.getRealRemote().getBits(); // this makes sure answer is a specific as your question
-            ret->push_back(rr);
+          try {
+            auto recvec=luaSynth(rec->getCode(), target, sd.qname, sd.domain_id, p, rec->d_type);
+            for(const auto& r : recvec) {
+              rr.dr.d_type = rec->d_type; // might be CNAME
+              rr.dr.d_content = r;
+              rr.scopeMask = p.getRealRemote().getBits(); // this makes sure answer is a specific as your question
+              ret->push_back(rr);
+            }
+          }
+          catch (std::exception &e) {
+            while (B.get(rr)) ;                 // don't leave DB handle in bad state
+
+            throw;
           }
         }
       }
@@ -1358,6 +1365,8 @@ std::unique_ptr<DNSPacket> PacketHandler::doQuestion(DNSPacket& p)
             }
           }
           catch(std::exception &e) {
+            while (B.get(rr)) ;              // don't leave DB handle in bad state
+
             r=p.replyPacket();
             r->setRcode(RCode::ServFail);