summaryrefslogtreecommitdiffstats
path: root/crypto/comp
diff options
context:
space:
mode:
authorDavid Brodski <bid@softing.com>2014-05-13 18:06:27 +0200
committerRich Salz <rsalz@openssl.org>2015-08-26 17:34:52 -0400
commit8cbb153357896c4b224e0678550944f7851bc3b2 (patch)
tree4dbd0e8e8850a706dad003506f4be12c04220f4a /crypto/comp
parent208b2d541dcb3b8f62639d2a8cc5771af4ba8755 (diff)
Fixed problem with multiple load-unload of comp zlib
Signed-off-by: Rich Salz <rsalz@akamai.com> Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/comp')
-rw-r--r--crypto/comp/c_zlib.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 6a57f70926..f0fc0aff9e 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -309,7 +309,9 @@ COMP_METHOD *COMP_zlib(void)
void COMP_zlib_cleanup(void)
{
#ifdef ZLIB_SHARED
- DSO_free(zlib_dso);
+ if (zlib_dso != NULL)
+ DSO_free(zlib_dso);
+ zlib_dso = NULL;
#endif
}