Fix an error path bug in rpz.c:update_nodes()

When dns_db_createiterator() fails, 'updbit' should not be destroyed
for obvious reasons, i.e. it is NULL.

(cherry picked from commit ef4f15d2d1f2b97c1443c3dc0422765bdc06ef9e)

diff --git a/lib/dns/rpz.c b/lib/dns/rpz.c
index 5792320d1f425185dbe50db4acd377cfbfb223e2..dbdf6a05fca0726fc9af472bd2a9663ece752c91 100644 (file)
--- a/lib/dns/rpz.c
+++ b/lib/dns/rpz.c
@@ -1725,7 +1725,7 @@ update_nodes(dns_rpz_zone_t *rpz, isc_ht_t *newnodes) {
                              DNS_LOGMODULE_MASTER, ISC_LOG_ERROR,
                              "rpz: %s: failed to create DB iterator - %s",
                              domain, isc_result_totext(result));
-               goto cleanup;
+               return (result);
        }
 
        result = dns_dbiterator_first(updbit);