|
 |
fd4b48 |
commit 3a2ea636103eaf40404fb82f228605d384c36434
|
|
|
fd4b48 |
Author: Mark Andrews <marka@isc.org>
|
|
|
fd4b48 |
Date: Tue Dec 17 09:08:59 2013 +1100
|
|
|
fd4b48 |
|
|
|
fd4b48 |
3692. [bug] Two calls to dns_db_getoriginnode were fatal if there
|
|
|
fd4b48 |
was no data at the node. [RT #35080]
|
|
|
fd4b48 |
|
|
|
fd4b48 |
(cherry picked from commit 161e803a5608956271d8120be37a1b383d14b647)
|
|
|
fd4b48 |
|
|
|
fd4b48 |
diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
|
|
|
fd4b48 |
index 2dd4aa0..941b77e 100644
|
|
|
fd4b48 |
--- a/lib/dns/rbtdb.c
|
|
|
fd4b48 |
+++ b/lib/dns/rbtdb.c
|
|
|
fd4b48 |
@@ -1638,8 +1638,11 @@ decrement_reference(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
|
|
|
fd4b48 |
|
|
|
fd4b48 |
nodelock = &rbtdb->node_locks[bucket];
|
|
|
fd4b48 |
|
|
|
fd4b48 |
+#define KEEP_NODE(n, r) \
|
|
|
fd4b48 |
+ ((n)->data != NULL || (n)->down != NULL || (n) == (r)->origin_node)
|
|
|
fd4b48 |
+
|
|
|
fd4b48 |
/* Handle easy and typical case first. */
|
|
|
fd4b48 |
- if (!node->dirty && (node->data != NULL || node->down != NULL)) {
|
|
|
fd4b48 |
+ if (!node->dirty && KEEP_NODE(node, rbtdb)) {
|
|
|
fd4b48 |
dns_rbtnode_refdecrement(node, &nrefs);
|
|
|
fd4b48 |
INSIST((int)nrefs >= 0);
|
|
|
fd4b48 |
if (nrefs == 0) {
|
|
|
fd4b48 |
@@ -1708,12 +1711,11 @@ decrement_reference(dns_rbtdb_t *rbtdb, dns_rbtnode_t *node,
|
|
|
fd4b48 |
isc_refcount_decrement(&nodelock->references, &refs);
|
|
|
fd4b48 |
INSIST((int)refs >= 0);
|
|
|
fd4b48 |
|
|
|
fd4b48 |
- /*
|
|
|
fd4b48 |
- * XXXDCL should this only be done for cache zones?
|
|
|
fd4b48 |
- */
|
|
|
fd4b48 |
- if (node->data != NULL || node->down != NULL)
|
|
|
fd4b48 |
+ if (KEEP_NODE(node, rbtdb))
|
|
|
fd4b48 |
goto restore_locks;
|
|
|
fd4b48 |
|
|
|
fd4b48 |
+#undef KEEP_NODE
|
|
|
fd4b48 |
+
|
|
|
fd4b48 |
if (write_locked) {
|
|
|
fd4b48 |
/*
|
|
|
fd4b48 |
* We can now delete the node.
|