From: David Brodski <bid@softing.com>
Date: Tue, 13 May 2014 16:06:27 +0000 (+0200)
Subject: Fixed problem with multiple load-unload of comp zlib
X-Git-Tag: OpenSSL_1_0_2e~124
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6cc31d4212c839c61b079af15b0dd43572ef8e68;p=oweals%2Fopenssl.git

Fixed problem with multiple load-unload of comp zlib

Signed-off-by: Rich Salz <rsalz@akamai.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 8cbb153357896c4b224e0678550944f7851bc3b2)
---

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 6731af8b0d..9c32614d3c 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -404,8 +404,9 @@ COMP_METHOD *COMP_zlib(void)
 void COMP_zlib_cleanup(void)
 {
 #ifdef ZLIB_SHARED
-    if (zlib_dso)
+    if (zlib_dso != NULL)
         DSO_free(zlib_dso);
+    zlib_dso = NULL;
 #endif
 }