From 3e1951e2c028832219fe34ef1af5725eebd9d7e3 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 25 Sep 2020 15:06:13 +0200
Subject: [PATCH] avoid bad DB state in impossible situation; fix a typo

---
 pdns/packethandler.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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--;
-- 
2.47.2