3072. [bug] dns_dns64_aaaaok() potential NULL pointer dereference.

                        [RT #20256]

diff --git a/CHANGES b/CHANGES
index f1d88cf63ee766717a1fb3100181e97b2d4275ec..33deb973c17fca99dadcb8642a05644cd4339bbb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3072.  [bug]           dns_dns64_aaaaok() potential NULL pointer dereference.
+                       [RT #20256]
+
 3071.  [bug]           has_nsec could be used unintialised in
                        update.c:next_active. [RT #20256]
 

diff --git a/lib/dns/dns64.c b/lib/dns/dns64.c
index dad7658c9718219a07caa7d72ddfffbd01f45c22..fd88f19b3715ae7d91e4d81b50ed03b2cceed42a 100644 (file)
--- a/lib/dns/dns64.c
+++ b/lib/dns/dns64.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dns64.c,v 1.6 2010/12/09 04:59:09 marka Exp $ */
+/* $Id: dns64.c,v 1.6.22.1 2011/03/11 13:04:36 marka Exp $ */
 
 #include <config.h>
 
@@ -253,6 +253,8 @@ dns_dns64_aaaaok(const dns_dns64_t *dns64, const isc_netaddr_t *reqaddr,
                 */
                if (dns64->excluded == NULL) {
                        answer = ISC_TRUE;
+                       if (aaaaok == NULL)
+                               goto done;
                        for (i = 0; i < aaaaoklen; i++)
                                aaaaok[i] = ISC_TRUE;
                        goto done;