upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-25 02:42:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

4495. [bug] A isc_mutex_init call was it being checked. [RT #43391]

Browse source 
(cherry picked from commit f21645e137)
This commit is contained in:
Mark Andrews 2016-10-28 11:14:38 +11:00
parent afa016c3c1
commit fb9cdee4af
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -1,3 +1,5 @@
4495. [bug] A isc_mutex_init call was it being checked. [RT #43391]
4494. [bug] Look for <editline/readline.h>. [RT #43429]
4493. [bug] bin/tests/system/dyndb/driver/Makefile.in should use

16
lib/dns/view.c
View file

@ -239,18 +239,22 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
view->new_zone_dbenv = NULL;
view->new_zone_config = NULL;
view->cfg_destroy = NULL;
isc_mutex_init(&view->new_zone_lock);
view->fail_ttl = 0;
view->failcache = NULL;
(void)dns_badcache_init(view->mctx, DNS_VIEW_FAILCACHESIZE,
&view->failcache);
view->v6bias = 0;
dns_badcache_init(view->mctx, DNS_VIEW_FAILCACHESIZE, &view->failcache);
view->dtenv = NULL;
view->dttypes = 0;
result = isc_mutex_init(&view->new_zone_lock);
if (result != ISC_R_SUCCESS)
goto cleanup_dynkeys;
if (isc_bind9) {
result = dns_order_create(view->mctx, &view->order);
if (result != ISC_R_SUCCESS)
goto cleanup_dynkeys;
goto cleanup_new_zone_lock;
}
result = dns_peerlist_new(view->mctx, &view->peers);
@ -286,6 +290,9 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
if (view->order != NULL)
dns_order_detach(&view->order);
cleanup_new_zone_lock:
DESTROYLOCK(&view->new_zone_lock);
cleanup_dynkeys:
if (view->dynamickeys != NULL)
dns_tsigkeyring_detach(&view->dynamickeys);
@ -515,7 +522,8 @@ destroy(dns_view_t *view) {
#endif /* HAVE_LMDB */
dns_fwdtable_destroy(&view->fwdtable);
dns_aclenv_destroy(&view->aclenv);
dns_badcache_destroy(&view->failcache);
if (view->failcache != NULL)
dns_badcache_destroy(&view->failcache);
DESTROYLOCK(&view->new_zone_lock);
DESTROYLOCK(&view->lock);
isc_refcount_destroy(&view->references);