From: Cliff Woolley <jwoolley@apache.org>
Date: Mon, 18 Mar 2002 03:19:30 +0000 (+0000)
Subject: Fix a possibly-uninitialized warning and a boolean logic bug
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f89a8877bd3f9255e40980d05590b192388cc4dd;p=thirdparty%2Fapache%2Fhttpd.git

Fix a possibly-uninitialized warning and a boolean logic bug


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@93992 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/ssl_engine_kernel.c b/ssl_engine_kernel.c
index ac1cacaf7c7..0d019906a4f 100644
--- a/ssl_engine_kernel.c
+++ b/ssl_engine_kernel.c
@@ -331,7 +331,7 @@ int ssl_hook_Access(request_rec *r)
     STACK_OF(X509) *cert_stack;
     X509_STORE *cert_store;
     X509_STORE_CTX cert_store_ctx;
-    STACK_OF(SSL_CIPHER) *cipher_list_old, *cipher_list = NULL;
+    STACK_OF(SSL_CIPHER) *cipher_list_old=NULL, *cipher_list = NULL;
     SSL_CIPHER *cipher = NULL;
     int depth, verify_old, verify, n;
 
@@ -1127,7 +1127,7 @@ int ssl_hook_Fixup(request_rec *r)
     /*
      * Check to see if SSL is on
      */
-    if (!(sc->bEnabled || (sslconn && (ssl = sslconn->ssl)))) {
+    if (!(sc->bEnabled && sslconn && (ssl = sslconn->ssl))) {
         return DECLINED;
     }