From a78a9d37a8883288a707a21b381e8a46fbdda556 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 19 Mar 2019 14:14:21 +1100 Subject: [PATCH] move item_out test inside lock in dns_dispatch_getnext() --- lib/dns/dispatch.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/dns/dispatch.c b/lib/dns/dispatch.c index 2b37d29097..a5dd6d75b4 100644 --- a/lib/dns/dispatch.c +++ b/lib/dns/dispatch.c @@ -126,7 +126,7 @@ struct dns_dispentry { isc_task_t *task; isc_taskaction_t action; void *arg; - bool item_out; + bool item_out; dispsocket_t *dispsocket; ISC_LIST(dns_dispatchevent_t) items; ISC_LINK(dns_dispentry_t) link; @@ -3271,13 +3271,14 @@ dns_dispatch_getnext(dns_dispentry_t *resp, dns_dispatchevent_t **sockevent) { disp = resp->disp; REQUIRE(VALID_DISPATCH(disp)); - REQUIRE(resp->item_out == true); - resp->item_out = false; - ev = *sockevent; *sockevent = NULL; LOCK(&disp->lock); + + REQUIRE(resp->item_out == true); + resp->item_out = false; + if (ev->buffer.base != NULL) free_buffer(disp, ev->buffer.base, ev->buffer.length); free_devent(disp, ev); @@ -3422,6 +3423,9 @@ dns_dispatch_removeresponse(dns_dispentry_t **resp, isc_task_send(disp->task[0], &disp->ctlevent); } +/* + * disp must be locked. + */ static void do_cancel(dns_dispatch_t *disp) { dns_dispatchevent_t *ev;