From: Ondřej Surý <ondrej@sury.org>
Date: Fri, 11 Oct 2019 22:15:51 +0000 (+0200)
Subject: libdns: Remove useless checks for ISC_R_MEMORY, which cannot happen now
X-Git-Tag: v9.15.6~36^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80b55d25de1c116f2aad7c9585689f392e314ae7;p=thirdparty%2Fbind9.git

libdns: Remove useless checks for ISC_R_MEMORY, which cannot happen now
---

diff --git a/lib/dns/client.c b/lib/dns/client.c
index 4cff788e2d6..48ed6aa88c9 100644
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -885,21 +885,12 @@ client_resfind(resctx_t *rctx, dns_fetchevent_t *event) {
 			 * Otherwise, get some resource for copying the
 			 * result.
 			 */
+			dns_name_t *aname = dns_fixedname_name(&rctx->name);
+
 			ansname = isc_mem_get(mctx, sizeof(*ansname));
-			if (ansname == NULL)
-				tresult = ISC_R_NOMEMORY;
-			else {
-				dns_name_t *aname;
-
-				aname = dns_fixedname_name(&rctx->name);
-				dns_name_init(ansname, NULL);
-				tresult = dns_name_dup(aname, mctx, ansname);
-				if (tresult != ISC_R_SUCCESS)
-					isc_mem_put(mctx, ansname,
-						    sizeof(*ansname));
-			}
-			if (tresult != ISC_R_SUCCESS)
-				result = tresult;
+			dns_name_init(ansname, NULL);
+
+			(void)dns_name_dup(aname, mctx, ansname);
 		}
 
 		switch (result) {