From 3c1dfbfc09384efcaa742ff3ae03a612f46c9976 Mon Sep 17 00:00:00 2001
From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 19 Dec 2018 10:08:39 +0100
Subject: [PATCH] prevent leak of file descriptor if running out of ports for
 incoming AXFR

(cherry picked from commit f852aff670c19b7dac9a0cef2c3912ebd8946201)
---
 pdns/resolver.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pdns/resolver.cc b/pdns/resolver.cc
index 51d81160c..3c45d44d3 100644
--- a/pdns/resolver.cc
+++ b/pdns/resolver.cc
@@ -86,10 +86,11 @@ int makeQuerySocket(const ComboAddress& local, bool udpOrTCP, bool nonLocalBind)
   }
   else {
     // tcp, let the kernel figure out the port
-    // cerr<<"letting kernel pick TCP port"<<endl;
     ourLocal.sin4.sin_port = 0;
-    if(::bind(sock, (struct sockaddr *)&ourLocal, ourLocal.getSocklen()) < 0)
+    if(::bind(sock, (struct sockaddr *)&ourLocal, ourLocal.getSocklen()) < 0) {
+      closesocket(sock);
       throw PDNSException("Resolver binding to local TCP socket on "+ourLocal.toString()+": "+stringerror());
+    }
   }
   return sock;
 }
-- 
2.40.0