2232. [bug] dns_adb_findaddrinfo() could fail and return

                        ISC_R_SUCCESS. [RT #17137]

diff --git a/CHANGES b/CHANGES
index 221b1a93dfccc82fd9a234822c8b72d8102f1f10..fa840235d3ce949bf8943f9db7bdcc1b61e1857c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2232.  [bug]           dns_adb_findaddrinfo() could fail and return
+                       ISC_R_SUCCESS. [RT #17137]
+
 2231.  [bug]           Building dlzbdb (contrib/dlz/bin/dlzbdb) was broken.
                        [RT #17088]
 

diff --git a/lib/dns/adb.c b/lib/dns/adb.c
index 1ea1c1dc8e8c4db89f3a6b5784b74fe10df22fff..c65c474530e721cf16882cd8b4459cc2a130836e 100644 (file)
--- a/lib/dns/adb.c
+++ b/lib/dns/adb.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb.c,v 1.215.18.16 2007/08/28 07:20:04 tbox Exp $ */
+/* $Id: adb.c,v 1.215.18.17 2007/09/11 02:23:26 marka Exp $ */
 
 /*! \file 
  *
@@ -3471,7 +3471,9 @@ dns_adb_findaddrinfo(dns_adb_t *adb, isc_sockaddr_t *sa,
 
        port = isc_sockaddr_getport(sa);
        addr = new_adbaddrinfo(adb, entry, port);
-       if (addr != NULL) {
+       if (addr == NULL) {
+               result = ISC_R_NOMEMORY;
+       } else {
                inc_entry_refcnt(adb, entry, ISC_FALSE);
                *addrp = addr;
        }