From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 2 Dec 2005 13:29:28 +0000 (+0000)
Subject: Update from HEAD.
X-Git-Tag: OpenSSL_0_9_8b~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36d51bea93f1056ca20d04c92cc5d4c22a876ab0;p=openssl

Update from HEAD.
---

diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c
index 8263f7315d..e077aa5b91 100644
--- a/crypto/comp/c_zlib.c
+++ b/crypto/comp/c_zlib.c
@@ -397,13 +397,18 @@ COMP_METHOD *COMP_zlib(void)
 			p_deflateInit_
 				= (deflateInit__ft) DSO_bind_func(zlib_dso,
 					"deflateInit_");
-			zlib_loaded++;
+
+			if (p_compress && p_inflateEnd && p_inflate
+				&& p_inflateInit_ && p_deflateEnd
+				&& p_deflate && p_deflateInit_)
+				zlib_loaded++;
 			}
 		}
 
 #endif
 #if defined(ZLIB) || defined(ZLIB_SHARED)
-	meth = &zlib_stateful_method;
+	if (zlib_loaded)
+		meth = &zlib_stateful_method;
 #endif
 
 	return(meth);