Commit 783a19dd authored by Joe Orton's avatar Joe Orton
Browse files

* modules/ssl/ssl_engine_vars (ssl_var_lookup): Fix potential 

segfaults if called with r=NULL, c!=NULL, spotted by Andr��.


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

ssl_engine_vars.c

+4 −4
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, 
            result = apr_psprintf(p, "%u", ap_get_server_port(r));

        else if (strcEQ(var, "SERVER_PROTOCOL"))

            result = r->protocol;

        else if (strcEQ(var, "REMOTE_USER"))

            result = r->user;

        else if (strcEQ(var, "AUTH_TYPE"))

            result = r->ap_auth_type;

    }



    /*
@@ -139,10 +143,6 @@ char *ssl_var_lookup(apr_pool_t *p, server_rec *s, conn_rec *c, request_rec *r, 
        SSLConnRec *sslconn = myConnConfig(c);

        if (strcEQ(var, "REMOTE_ADDR"))

            result = c->remote_ip;

        else if (strcEQ(var, "REMOTE_USER"))

            result = r->user;

        else if (strcEQ(var, "AUTH_TYPE"))

            result = r->ap_auth_type;

        else if (strlen(var) > 4 && strcEQn(var, "SSL_", 4) 

                 && sslconn && sslconn->ssl)

            result = ssl_var_lookup_ssl(p, c, var+4);