[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Rich Salz]

The branch OpenSSL_1_0_1-stable has been updated
       via  80c25ba6764c797f52982d45a12414618d48524a (commit)
      from  eb55a6f4558ce7a78647a21ac2ace8ddca7e7253 (commit)


- Log -----------------------------------------------------------------
commit 80c25ba6764c797f52982d45a12414618d48524a
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>
    (cherry picked from commit 8cbb153357896c4b224e0678550944f7851bc3b2)

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

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

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 6731af8..9c32614 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
 }