mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 06:25:31 +00:00
1828. [bug] isc_rwlock_init() failed to properly cleanup if it
encountered a error. [RT #13549]
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
* PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: rwlock.c,v 1.37 2004/03/05 05:10:49 marka Exp $ */
|
||||
/* $Id: rwlock.c,v 1.38 2005/03/15 02:03:11 marka Exp $ */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
@@ -109,7 +109,9 @@ isc_rwlock_init(isc_rwlock_t *rwl, unsigned int read_quota,
|
||||
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
|
||||
ISC_MSG_FAILED, "failed"),
|
||||
isc_result_totext(result));
|
||||
return (ISC_R_UNEXPECTED);
|
||||
result = ISC_R_UNEXPECTED;
|
||||
goto destroy_lock;
|
||||
|
||||
}
|
||||
result = isc_condition_init(&rwl->writeable);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
@@ -118,12 +120,20 @@ isc_rwlock_init(isc_rwlock_t *rwl, unsigned int read_quota,
|
||||
isc_msgcat_get(isc_msgcat, ISC_MSGSET_GENERAL,
|
||||
ISC_MSG_FAILED, "failed"),
|
||||
isc_result_totext(result));
|
||||
return (ISC_R_UNEXPECTED);
|
||||
result = ISC_R_UNEXPECTED;
|
||||
goto destroy_rcond;
|
||||
}
|
||||
|
||||
rwl->magic = RWLOCK_MAGIC;
|
||||
|
||||
return (ISC_R_SUCCESS);
|
||||
|
||||
destroy_rcond:
|
||||
(void)isc_condition_destroy(&rwl->readable);
|
||||
destroy_lock:
|
||||
DESTROYLOCK(&rwl->lock);
|
||||
|
||||
return (result);
|
||||
}
|
||||
|
||||
static isc_result_t
|
||||
|
Reference in New Issue
Block a user