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

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

(cherry picked from commit b551ee14bd12fff52aa05f7f94cd4e17cea52be3)

diff --git a/CHANGES b/CHANGES
index 92ce50abbb141ed40dbcca87126b982bc6fe8463..54a70edfbf14c23536babe802a673c8b5ac4ed7f 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]
+
 4636.  [bug]           Normalize rpz policy zone names when checking for
                        existence. [RT #45358]
 

diff --git a/bin/named/query.c b/bin/named/query.c
index 6eb13c0a8657ceff706daefa982c4407725818cc..85918bab4434d45a03ed33735748e6eff4d2750a 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1224,7 +1224,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.