more: 3410. [bug] Addressed Coverity warnings. [RT #31626]

move set_refreshkeytimer call within loop so that keydata is valid.

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 3ec12bcaab4b4c034dfeae080792deedf51a05cd..e878fa2baf60e9733c2da67c702c634b80d1f8af 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -3106,6 +3106,8 @@ create_keydata(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
                CHECK(update_one_rr(db, ver, diff, DNS_DIFFOP_ADD,
                                    dst_key_name(key), 0, &rdata));
                *changed = ISC_TRUE;
+               /* Refresh new keys from the zone apex as soon as possible. */
+               set_refreshkeytimer(zone, &keydata, now);
 
  skip:
                result = dns_keytable_nextkeynode(keytable, keynode, &nextnode);
@@ -3115,10 +3117,6 @@ create_keydata(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
                }
        }
 
-       /* Refresh new keys from the zone apex as soon as possible. */
-       if (*changed)
-               set_refreshkeytimer(zone, &keydata, now);
-
        if (keynode != NULL)
                dns_keytable_detachkeynode(keytable, &keynode);
        *keynodep = NULL;