From b551ee14bd12fff52aa05f7f94cd4e17cea52be3 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 23 Jun 2017 17:17:28 +1000
Subject: [PATCH] 4640.   [bug]           If query_findversion failed in
 query_getdb due to                         memory failure the error status
 was incorrectly                         discarded. [RT #45331]

---
 CHANGES           | 4 ++++
 bin/named/query.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 3e2037ec48..05bb42f998 100644
--- 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 39b99a2f8b..49c5d4070b 100644
--- 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.