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 f33c15605f97a5300f71ab39b58a664c0ea25f2f..ea80d401888ffd6329926a46942004d89744fe4f 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 8d5c306d64f4edf82a7c350ad471456ac586e4c1..cc0e0a82c9f6e970023e10ec625c533cff7263c2 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -1267,7 +1267,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.