upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-04 09:42:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

2214. [bug] Deregister OpenSSL lock callback when cleaning

Browse source 
up. [RT #17098]
This commit is contained in:
Mark Andrews 2007-08-27 03:15:14 +00:00
parent 1fcfbb18ef
commit 6224164cbd
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
2214. [bug] Deregister OpenSSL lock callback when cleaning
up. [RT #17098]
2210. [bug] Deleting class specific records via UPDATE could
fail. [RT #17074]

8
lib/dns/openssl_link.c
View file

@ -18,7 +18,7 @@
/*
* Principal Author: Brian Wellington
* $Id: openssl_link.c,v 1.1.2.3 2006/05/23 23:51:02 marka Exp $
* $Id: openssl_link.c,v 1.1.2.4 2007/08/27 03:15:14 marka Exp $
*/
#ifdef OPENSSL
@ -141,6 +141,7 @@ dst__openssl_init() {
dst__mem_free(rm);
#endif
cleanup_mutexinit:
CRYPTO_set_locking_callback(NULL);
RUNTIME_CHECK(isc_mutexblock_destroy(locks, nlocks) == ISC_R_SUCCESS);
cleanup_mutexalloc:
dst__mem_free(locks);
@ -155,13 +156,14 @@ dst__openssl_destroy() {
e = NULL;
}
#endif
if (rm != NULL)
dst__mem_free(rm);
if (locks != NULL) {
CRYPTO_set_locking_callback(NULL);
RUNTIME_CHECK(isc_mutexblock_destroy(locks, nlocks) ==
ISC_R_SUCCESS);
dst__mem_free(locks);
}
if (rm != NULL)
dst__mem_free(rm);
}
#endif /* OPENSSL */