From: Ondřej Surý <ondrej@sury.org>
Date: Fri, 13 Sep 2019 08:52:06 +0000 (+0200)
Subject: Move the failure handling block closer to the only place where it could fail
X-Git-Tag: v9.15.5~11^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69ecc711ac0c862b4ec8a186fcd06db8023526a6;p=thirdparty%2Fbind9.git

Move the failure handling block closer to the only place where it could fail
---

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index 77658bcd617..cef118c5ce9 100644
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -4528,14 +4528,11 @@ find_deepest_zonecut(rbtdb_search_t *search, dns_rbtnode_t *node,
 								      foundname,
 								      NULL);
 					if (result != ISC_R_SUCCESS) {
-						break;
-					}
-				}
-				if (result != ISC_R_SUCCESS) {
-					if (nodep != NULL) {
-						*nodep = NULL;
+						if (nodep != NULL) {
+							*nodep = NULL;
+						}
+						goto node_exit;
 					}
-					goto node_exit;
 				}
 			}
 			result = DNS_R_DELEGATION;