[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  1b6fa9fdf86fcfd5ce2a84d41388b79e328e14a3 (commit)
      from  7aae0d33ac5e0569fba7f03b5bb973cc5ff79bca (commit)


- Log -----------------------------------------------------------------
commit 1b6fa9fdf86fcfd5ce2a84d41388b79e328e14a3
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Nov 8 11:59:13 2017 -0500

    Don't NULL check before calling DSO_free.
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/4703)

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

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

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 1270e50..05787aa 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -262,8 +262,7 @@ COMP_METHOD *COMP_zlib(void)
 void comp_zlib_cleanup_int(void)
 {
 #ifdef ZLIB_SHARED
-    if (zlib_dso != NULL)
-        DSO_free(zlib_dso);
+    DSO_free(zlib_dso);
     zlib_dso = NULL;
 #endif
 }