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

Do not fail on NULL passed to OpenSSL_free

Browse Source 
Some plugins might call it after deconstruction. Do not crash if there
is no reason for it.

(cherry picked from commit a26673a088)
This commit is contained in:
Petr Menšík
2019-01-29 15:42:51 -08:00
committed by Evan Hunt
parent dda175e108
commit af021f136e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+4
View File
@@ -1,3 +1,7 @@
5146. [bug] Removed an unnecessary assert that could be
triggered from PKCS#11 modules during
deconstruction. [GL #841]
5143. [bug] dnssec-keymgr and dnssec-coverage failed to find 5143. [bug] dnssec-keymgr and dnssec-coverage failed to find
key files for zone names ending in ".". [GL #560] key files for zone names ending in ".". [GL #560]
lib/dns/openssl_link.c
+4 -2
View File
@@ -160,9 +160,11 @@ mem_alloc(size_t size FLARG) {
static void static void
mem_free(void *ptr FLARG) { mem_free(void *ptr FLARG) {
INSIST(dst__memory_pool != NULL); if (ptr != NULL) {
if (ptr != NULL) INSIST(dst__memory_pool != NULL);
isc__mem_free(dst__memory_pool, ptr FLARG_PASS); isc__mem_free(dst__memory_pool, ptr FLARG_PASS);
}
} }
static void * static void *