From: Joe Orton <jorton@apache.org>
Date: Mon, 1 Nov 2004 22:53:36 +0000 (+0000)
Subject: * modules/ssl/ssl_engine_kernel.c (ssl_hook_UserCheck): Fix possible
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af99b35d729fdd4ef474e29b604b9c4ca054b2db;p=thirdparty%2Fapache%2Fhttpd.git

* modules/ssl/ssl_engine_kernel.c (ssl_hook_UserCheck): Fix possible
NULL pointer dereference in some configurations.

PR: 31848


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

diff --git a/ssl_engine_kernel.c b/ssl_engine_kernel.c
index 6557c1f3833..daa47da052f 100644
--- a/ssl_engine_kernel.c
+++ b/ssl_engine_kernel.c
@@ -874,7 +874,8 @@ int ssl_hook_UserCheck(request_rec *r)
      * - ssl not enabled
      * - client did not present a certificate
      */
-    if (!((sc->enabled == SSL_ENABLED_TRUE || sc->enabled == SSL_ENABLED_OPTIONAL) && sslconn->ssl && sslconn->client_cert) ||
+    if (!((sc->enabled == SSL_ENABLED_TRUE || sc->enabled == SSL_ENABLED_OPTIONAL) 
+          && sslconn && sslconn->ssl && sslconn->client_cert) ||
         !(dc->nOptions & SSL_OPT_FAKEBASICAUTH) || r->user)
     {
         return DECLINED;