From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 24 Jan 2018 09:08:36 +0000 (+0100)
Subject: Rec: Fix 2 use-after-free bugs
X-Git-Tag: dnsdist-1.3.0~125^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F6222%2Fhead;p=thirdparty%2Fpdns.git

Rec: Fix 2 use-after-free bugs

Fix CID 1385373.
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 1929b165a1..c2b916be69 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1589,15 +1589,15 @@ static void handleRunningTCPQuestion(int fd, FDMultiplexer::funcparam_t& var)
       }
 #endif
       if(dc->d_mdp.d_header.qr) {
-        delete dc;
         g_stats.ignoredCount++;
         L<<Logger::Error<<"Ignoring answer from TCP client "<< dc->getRemote() <<" on server socket!"<<endl;
+        delete dc;
         return;
       }
       if(dc->d_mdp.d_header.opcode) {
-        delete dc;
         g_stats.ignoredCount++;
         L<<Logger::Error<<"Ignoring non-query opcode from TCP client "<< dc->getRemote() <<" on server socket!"<<endl;
+        delete dc;
         return;
       }
       else {