refactor validated()

minor changes to ensure that fctx reference counting is clear and correct.

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 00e6c2ea2fea20555724b8f6c25086adcf10f3d7..c33e790cda94805cf03c08bbcc89c1a174eed6f7 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -5384,7 +5384,7 @@ validated(isc_task_t *task, isc_event_t *event) {
        dns_resolver_t *res = NULL;
        dns_valarg_t *valarg = NULL;
        dns_validatorevent_t *vevent = NULL;
-       fetchctx_t *fctx = NULL, *vfctx = NULL;
+       fetchctx_t *fctx = NULL;
        bool chaining;
        bool negative;
        bool sentresponse;
@@ -5408,7 +5408,6 @@ validated(isc_task_t *task, isc_event_t *event) {
 
        fctx = valarg->fctx;
        valarg->fctx = NULL;
-       vfctx = fctx;
 
        FCTXTRACE("received validation completion event");
 
@@ -5451,6 +5450,7 @@ validated(isc_task_t *task, isc_event_t *event) {
         */
        if (SHUTTINGDOWN(fctx) && !sentresponse) {
                UNLOCK(&res->buckets[bucketnum].lock);
+               fctx_detach(&fctx);
                goto cleanup_event;
        }
 
@@ -5550,6 +5550,7 @@ validated(isc_task_t *task, isc_event_t *event) {
                }
                result = fctx->vresult;
                add_bad(fctx, message, addrinfo, result, badns_validation);
+               dns_message_detach(&message);
                isc_event_free(&event);
 
                UNLOCK(&res->buckets[bucketnum].lock);
@@ -5558,7 +5559,10 @@ validated(isc_task_t *task, isc_event_t *event) {
                fctx->validator = ISC_LIST_HEAD(fctx->validators);
                if (fctx->validator != NULL) {
                        dns_validator_send(fctx->validator);
+                       fctx_detach(&fctx);
                } else if (sentresponse) {
+                       /* Detach the extra ref that was set in valcreate() */
+                       fctx_unref(fctx);
                        fctx_done_detach(&fctx, result); /* Locks bucket */
                } else if (result == DNS_R_BROKENCHAIN) {
                        isc_result_t tresult;
@@ -5575,13 +5579,14 @@ validated(isc_task_t *task, isc_event_t *event) {
                                dns_resolver_addbadcache(res, fctx->name,
                                                         fctx->type, &expire);
                        }
+
+                       /* Detach the extra ref that was set in valcreate() */
+                       fctx_unref(fctx);
                        fctx_done_detach(&fctx, result); /* Locks bucket */
                } else {
                        fctx_try(fctx, true, true); /* Locks bucket */
+                       fctx_detach(&fctx);
                }
-
-               dns_message_detach(&message);
-               fctx_detach(&vfctx);
                return;
        }
 
@@ -5705,6 +5710,7 @@ validated(isc_task_t *task, isc_event_t *event) {
                        maybe_cancel_validators(fctx, true);
                }
                UNLOCK(&res->buckets[bucketnum].lock);
+               fctx_detach(&fctx);
                goto cleanup_event;
        }
 
@@ -5721,6 +5727,7 @@ validated(isc_task_t *task, isc_event_t *event) {
                dns_db_detachnode(fctx->cache, &node);
                UNLOCK(&res->buckets[bucketnum].lock);
                dns_validator_send(ISC_LIST_HEAD(fctx->validators));
+               fctx_detach(&fctx);
                goto cleanup_event;
        }
 
@@ -5877,12 +5884,13 @@ noanswer_response:
        }
 
        UNLOCK(&res->buckets[bucketnum].lock);
+       /* Detach the extra reference that was set in valcreate() */
+       fctx_unref(fctx);
        fctx_done_detach(&fctx, result); /* Locks bucket. */
 
 cleanup_event:
        INSIST(node == NULL);
        dns_message_detach(&message);
-       fctx_detach(&vfctx);
        isc_event_free(&event);
 }