You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2018/05/14 20:51:32 UTC
svn commit: r1831591 - /httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
Author: jailletc36
Date: Mon May 14 20:51:31 2018
New Revision: 1831591
URL: http://svn.apache.org/viewvc?rev=1831591&view=rev
Log:
I don't know if 'c' can be NULL here, but we should not dereference it before checking.
Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?rev=1831591&r1=1831590&r2=1831591&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c Mon May 14 20:51:31 2018
@@ -2552,7 +2552,7 @@ int ssl_callback_alpn_select(SSL *ssl,
void *arg)
{
conn_rec *c = (conn_rec*)SSL_get_app_data(ssl);
- SSLConnRec *sslconn = myConnConfig(c);
+ SSLConnRec *sslconn;
apr_array_header_t *client_protos;
const char *proposed;
size_t len;
@@ -2563,6 +2563,7 @@ int ssl_callback_alpn_select(SSL *ssl,
if (c == NULL) {
return SSL_TLSEXT_ERR_OK;
}
+ sslconn = myConnConfig(c);
if (inlen == 0) {
/* someone tries to trick us? */