[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  8cbb153357896c4b224e0678550944f7851bc3b2 (commit)
      from  208b2d541dcb3b8f62639d2a8cc5771af4ba8755 (commit)


- Log -----------------------------------------------------------------
commit 8cbb153357896c4b224e0678550944f7851bc3b2
Author: David Brodski <bid at softing.com>
Date:   Tue May 13 18:06:27 2014 +0200

    Fixed problem with multiple load-unload of comp zlib
    
    Signed-off-by: Rich Salz <rsalz at akamai.com>
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/comp/c_zlib.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 6a57f70..f0fc0af 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
 }