From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 25 Sep 2020 13:06:13 +0000 (+0200)
Subject: avoid bad DB state in impossible situation; fix a typo
X-Git-Tag: auth-4.4.0-alpha1~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F9530%2Fhead;p=thirdparty%2Fpdns.git

avoid bad DB state in impossible situation; fix a typo
---

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 9347adb87b..4571c025f5 100644
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -468,7 +468,9 @@ DNSName PacketHandler::doAdditionalServiceProcessing(const DNSName &firstTarget,
           break;
         }
         default:
-          throw PDNSException("Unknown type (" + QType(qtype).getName() + "for additional service processing");
+          while (B.get(rr)) ;              // don't leave DB handle in bad state
+
+          throw PDNSException("Unknown type (" + QType(qtype).getName() + ") for additional service processing");
       }
     }
     ctr--;