4165. [bug] An failure to reset a value to NULL in tkey.c could

                        result in an assertion failure. (CVE-2015-5477)
                        [RT #40046]

diff --git a/CHANGES b/CHANGES
index 387d3f517e32849ffd7aa3ca3188268778e41275..ebed47d5e63d837a331b8b4e5dd9501e2885afc1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4165.  [bug]           An failure to reset a value to NULL in tkey.c could
+                       result in an assertion failure. (CVE-2015-5477)
+                       [RT #40046]
+
 4164.  [bug]           Don't rename slave files and journals on out of memory.
                        [RT #40033]
 

diff --git a/lib/dns/tkey.c b/lib/dns/tkey.c
index 66210d50f97fbe4bb6a51c4f4db403d4f671c09b..34ad90bca3fb854e969abae84df7f2fdc54d0361 100644 (file)
--- a/lib/dns/tkey.c
+++ b/lib/dns/tkey.c
@@ -654,6 +654,7 @@ dns_tkey_processquery(dns_message_t *msg, dns_tkeyctx_t *tctx,
                 * Try the answer section, since that's where Win2000
                 * puts it.
                 */
+               name = NULL;
                if (dns_message_findname(msg, DNS_SECTION_ANSWER, qname,
                                         dns_rdatatype_tkey, 0, &name,
                                         &tkeyset) != ISC_R_SUCCESS) {