[master] race condition when reloading while resigning

4661.	[bug]		A race condition could occur if a zone was reloaded
			while resigning, triggering a crash in
			rbtdb.c:closeversion(). [RT #45276]

diff --git a/CHANGES b/CHANGES
index 767d06203c509f59bb166aa039649a9891036edc..992eb1c90a8a8a7bcfad0397fefc0f0399ec2c3b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+4661.  [bug]           A race condition could occur if a zone was reloaded
+                       while resigning, triggering a crash in
+                       rbtdb.c:closeversion(). [RT #45276]
+
 4660.  [bug]           Remove spurious "peer" from Windows socket log
                        messages. [RT #45617]
 

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index ab2b89e1503ad5993576b2cd03cd3217589a5324..247b77641d29013ba25bbd302e21f98db63fae24 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -6438,7 +6438,7 @@ zone_resigninc(dns_zone_t *zone) {
        for (i = 0; i < nkeys; i++)
                dst_key_free(&zone_keys[i]);
        if (version != NULL) {
-               dns_db_closeversion(zone->db, &version, ISC_FALSE);
+               dns_db_closeversion(db, &version, ISC_FALSE);
                dns_db_detach(&db);
        } else if (db != NULL)
                dns_db_detach(&db);