Commit e2775332 authored by Joe Orton's avatar Joe Orton
Browse files

Merge r105663 from trunk: 

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

PR: 31848
Reviewed by: jorton, wrowe, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@125749 13f79535-47bb-0310-9956-ffa450edef68
parent e895a617

STATUS

+0 −5
Changes for STATUS: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -148,11 +148,6 @@ PATCHES TO BACKPORT FROM 2.1 
       svn rev 106653

       +1: wrowe, nd, trawick



    *) mod_ssl: Fix an possible NULL pointer dereference in some configs.

       http://nagoya.apache.org/bugzilla/showattachment.cgi?attach_id=13182

       PR: 31848

       +1: jorton, wrowe, jim



    *) several changes to improve logging of connection-oriented errors, including

       ap_log_cerror() API (needs minor bump in addition to changes below)

         http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.289&r2=1.291

modules/ssl/ssl_engine_kernel.c

+1 −1
Changes for modules/ssl/ssl_engine_kernel.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -860,7 +860,7 @@ int ssl_hook_UserCheck(request_rec *r) 
     * - ssl not enabled

     * - client did not present a certificate

     */

    if (!(sc->enabled && sslconn->ssl && sslconn->client_cert) ||

    if (!(sc->enabled && sslconn && sslconn->ssl && sslconn->client_cert) ||

        !(dc->nOptions & SSL_OPT_FAKEBASICAUTH) || r->user)

    {

        return DECLINED;