From cf4ceeee5fee2ebdca74f82514c14fd50939f85b Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 11 Mar 2011 13:02:33 +0000
Subject: [PATCH] 3072.   [bug]           dns_dns64_aaaaok() potential NULL
 pointer dereference.                         [RT #20256]

---
 CHANGES         | 3 +++
 lib/dns/dns64.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index d5b2e88d26..6b29cd232e 100644
--- 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 dad7658c97..0c35f561cd 100644
--- 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.7 2011/03/11 13:02:33 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;