From: Mark Zealey <mark@markandruth.co.uk>
Date: Mon, 13 Jan 2014 09:36:50 +0000 (+0200)
Subject: close socket if bind fails to fix coverity leak issues
X-Git-Tag: rec-3.6.0-rc1~246^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c896042b978781b9a2f499825c693a43f6ee7b3;p=pdns

close socket if bind fails to fix coverity leak issues
---

diff --git a/pdns/nameserver.cc b/pdns/nameserver.cc
index 04d902701..1be9663eb 100644
--- a/pdns/nameserver.cc
+++ b/pdns/nameserver.cc
@@ -128,6 +128,7 @@ void UDPNameserver::bindIPv4()
 
     g_localaddresses.push_back(locala);
     if(::bind(s, (sockaddr*)&locala, locala.getSocklen()) < 0) {
+      close(s);
       if( errno == EADDRNOTAVAIL && ! ::arg().mustDo("local-address-nonexist-fail") ) {
         L<<Logger::Error<<"IPv4 Address " << localname << " does not exist on this server - skipping UDP bind" << endl;
         continue;
@@ -224,6 +225,7 @@ void UDPNameserver::bindIPv6()
     }
     g_localaddresses.push_back(locala);
     if(::bind(s, (sockaddr*)&locala, sizeof(locala))<0) {
+      close(s);
       if( errno == EADDRNOTAVAIL && ! ::arg().mustDo("local-ipv6-nonexist-fail") ) {
         L<<Logger::Error<<"IPv6 Address " << localname << " does not exist on this server - skipping UDP bind" << endl;
         continue;
diff --git a/pdns/tcpreceiver.cc b/pdns/tcpreceiver.cc
index 2bc40f2c3..6f1e4b239 100644
--- a/pdns/tcpreceiver.cc
+++ b/pdns/tcpreceiver.cc
@@ -1003,6 +1003,7 @@ TCPNameserver::TCPNameserver()
     }
     
     if(::bind(s, (sockaddr*)&local, local.getSocklen())<0) {
+      close(s);
       if( errno == EADDRNOTAVAIL && ! ::arg().mustDo("local-address-nonexist-fail") ) {
         L<<Logger::Error<<"IPv4 Address " << *laddr << " does not exist on this server - skipping TCP bind" << endl;
         continue;
@@ -1043,6 +1044,7 @@ TCPNameserver::TCPNameserver()
       L<<Logger::Error<<"Failed to set IPv6 socket to IPv6 only, continuing anyhow: "<<strerror(errno)<<endl;
     }
     if(bind(s, (const sockaddr*)&local, local.getSocklen())<0) {
+      close(s);
       if( errno == EADDRNOTAVAIL && ! ::arg().mustDo("local-ipv6-nonexist-fail") ) {
         L<<Logger::Error<<"IPv6 Address " << *laddr << " does not exist on this server - skipping TCP bind" << endl;
         continue;