mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 05:28:00 +00:00
Code Issues Releases Wiki Activity

adjust goto target and conditional compilation so that cleanup_spillattimer and cleanup_alglock labels match the element to be cleanup and so that they are always used

Browse Source
This commit is contained in:
Mark Andrews 2018-02-20 12:46:35 +11:00 committed by Evan Hunt
parent 4c753f5880
commit 7b27be54ee
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/dns/resolver.c
View File

@ -9821,7 +9821,11 @@ dns_resolver_create(dns_view_t *view,
#if USE_MBSLOCK #if USE_MBSLOCK
result = isc_rwlock_init(&res->mbslock, 0, 0); result = isc_rwlock_init(&res->mbslock, 0, 0);
if (result != ISC_R_SUCCESS) if (result != ISC_R_SUCCESS)
#if USE_ALGLOCK
goto cleanup_alglock; goto cleanup_alglock;
#else
goto cleanup_spillattimer;
#endif
#endif #endif
res->magic = RES_MAGIC; res->magic = RES_MAGIC;
@ -9830,12 +9834,11 @@ dns_resolver_create(dns_view_t *view,
return (ISC_R_SUCCESS); return (ISC_R_SUCCESS);
#if USE_MBSLOCK #if USE_ALGLOCK && USE_MBSLOCK
cleanup_alglock: cleanup_alglock:
#if USE_ALGLOCK
isc_rwlock_destroy(&res->alglock); isc_rwlock_destroy(&res->alglock);
#endif #endif
#endif
#if USE_ALGLOCK || USE_MBSLOCK #if USE_ALGLOCK || USE_MBSLOCK
cleanup_spillattimer: cleanup_spillattimer:
isc_timer_detach(&res->spillattimer); isc_timer_detach(&res->spillattimer);