The new init functions can now fail so shouldn't be void

[openssl.git] / crypto / comp / c_zlib.c

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 619765ceff7355a33a5b6b5a330e0cc87dd7e18f..baad9c66eed9d3101971e0afebacbfa83033a81a 100644 (file)
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -289,9 +289,13 @@ COMP_METHOD *COMP_zlib(void)
                 && p_inflateInit_ && p_deflateEnd
                 && p_deflate && p_deflateInit_ && p_zError)
                 zlib_loaded++;
                 && p_inflateInit_ && p_deflateEnd
                 && p_deflate && p_deflateInit_ && p_zError)
                 zlib_loaded++;

+
+            if (!OPENSSL_init_crypto(OPENSSL_INIT_ZLIB, NULL)) {
+                COMP_zlib_cleanup();
+                return meth;
+            }

             if (zlib_loaded)
                 meth = &zlib_stateful_method;
             if (zlib_loaded)
                 meth = &zlib_stateful_method;

-            OPENSSL_init_crypto(OPENSSL_INIT_ZLIB, NULL);

         }
     }
 #endif
         }
     }
 #endif