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

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-25 21:47:37 +01:00 committed by Evan Hunt
parent dda175e108
commit af021f136e
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
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
key files for zone names ending in ".". [GL #560]

6
lib/dns/openssl_link.c
View file

@ -160,9 +160,11 @@ mem_alloc(size_t size FLARG) {
static void
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);
}
}
static void *