From: Mark Andrews <marka@isc.org>
Date: Fri, 26 Oct 2012 04:50:34 +0000 (+1100)
Subject: 3407.   [security]      Named could die on specific queries with dns64 enabled.
X-Git-Tag: v9.8.4-P1^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eaf3d3bb6da06b461e1ddf1c55cbe1b52bb7a02;p=thirdparty%2Fbind9.git

3407.   [security]      Named could die on specific queries with dns64 enabled.
                        [Addressed in change #3388 for BIND 9.8.5 and 9.9.3.]

Conflicts:
	CHANGES
	version
---

diff --git a/CHANGES b/CHANGES
index 801f9918e5f..6d1ee310999 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+	--- 9.8.4-P1 released ---
+
+3407.	[security]	Named could die on specific queries with dns64 enabled.
+			[Addressed in change #3388 for BIND 9.8.5 and 9.9.3.]
+
 	--- 9.8.4 released ---
 
 3383.	[security]	A certain combination of records in the RBT could
diff --git a/bin/named/query.c b/bin/named/query.c
index 2bdaac820e4..9e67f2d2187 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -5183,10 +5183,12 @@ dns64_ttl(dns_db_t *db, dns_dbversion_t *version) {
 	isc_result_t result;
 	isc_uint32_t ttl = ISC_UINT32_MAX;
 
+	dns_rdataset_init(&rdataset);
+
 	result = dns_db_getoriginnode(db, &node);
 	if (result != ISC_R_SUCCESS)
 		goto cleanup;
-	dns_rdataset_init(&rdataset);
+
 	result = dns_db_findrdataset(db, node, version, dns_rdatatype_soa,
 				     0, 0, &rdataset, NULL);
 	if (result != ISC_R_SUCCESS)
diff --git a/version b/version
index 3f4360ed2bf..1090bee28ce 100644
--- a/version
+++ b/version
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=8
 PATCHVER=4
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1