4640. [bug] If query_findversion failed in query_getdb due to

                        memory failure the error status was incorrectly
                        discarded. [RT #45331]

diff --git a/CHANGES b/CHANGES
index 3e2037ec48a7405b224bbfd036aa30b7d79a080e..05bb42f998d1a9a49f8ef37048e2caaf4f8cfcea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4640.  [bug]           If query_findversion failed in query_getdb due to
+                       memory failure the error status was incorrectly
+                       discarded. [RT #45331]
+
 4639.  [bug]           Fix a regression in --with-tuning reporting introduced
                        by change 4488. [RT #45396]
 

diff --git a/bin/named/query.c b/bin/named/query.c
index 39b99a2f8b79a5356d71eee9b0f34d7a31abfa04..49c5d4070be055180e032e0b0d087c55af87fb4a 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1520,7 +1520,7 @@ query_getdb(ns_client_t *client, dns_name_t *name, dns_rdatatype_t qtype,
 
                        dbversion = query_findversion(client, tdbp);
                        if (dbversion == NULL) {
-                               result = ISC_R_NOMEMORY;
+                               tresult = ISC_R_NOMEMORY;
                        } else {
                                /*
                                 * Be sure to return our database.