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 801f9918e5feb03a2a430bcb465a40b3a645be5e..6d1ee3109994f0cbd4992585c675863ed7d4e1c5 100644 (file)
--- 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 2bdaac820e461e8372a1b7f9c0db5875670e62c6..9e67f2d2187fd37019c1969e45081748b36a0878 100644 (file)
--- 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 3f4360ed2bfc2701314adff9ba91cdf9b1940ae2..1090bee28cee5f35f3d83434217ec0174f2f1884 100644 (file)
--- a/version
+++ b/version
@@ -6,5 +6,5 @@
 MAJORVER=9
 MINORVER=8
 PATCHVER=4
-RELEASETYPE=
-RELEASEVER=
+RELEASETYPE=-P
+RELEASEVER=1