ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

fctx_finddone: call fctx_destroy within the bucket lock

Browse Source
This commit is contained in:
Evan Hunt
2012-04-24 15:07:43 -07:00
parent d920a41f95
commit fa31ca157f
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@@ -1,7 +1,11 @@
3309. [bug] resolver.c:fctx_finddone() was not threadsafe.
[RT #27995]
3307. [bug] Add missing ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS.
[RT #28956]
3304. [bug] Use hmctx, not mctx when freeing rbtdb->heaps. [RT #28571]
3304. [bug] Use hmctx, not mctx when freeing rbtdb->heaps.
[RT #28571]
3301. [contrib] Update queryperf to build on darwin. Add -R flag
for non-recursive queries. [RT #28565]

10
lib/dns/resolver.c
View File

@@ -2156,7 +2156,6 @@ fctx_finddone(isc_task_t *task, isc_event_t *event) {
isc_boolean_t want_try = ISC_FALSE;
isc_boolean_t want_done = ISC_FALSE;
isc_boolean_t bucket_empty = ISC_FALSE;
isc_boolean_t destroy = ISC_FALSE;
unsigned int bucketnum;
find = event->ev_sender;
@@ -2195,17 +2194,12 @@ fctx_finddone(isc_task_t *task, isc_event_t *event) {
}
} else if (SHUTTINGDOWN(fctx) && fctx->pending == 0 &&
fctx->nqueries == 0 && ISC_LIST_EMPTY(fctx->validators)) {
/*
* Note that we had to wait until we had the lock before
* looking at fctx->references.
*/
if (fctx->references == 0)
destroy = ISC_TRUE;
bucket_empty = fctx_destroy(fctx);
}
UNLOCK(&res->buckets[bucketnum].lock);
if (destroy)
bucket_empty = fctx_destroy(fctx);
isc_event_free(&event);
dns_adb_destroyfind(&find);