]> granicus.if.org Git - apache/commitdiff
I don't know if 'c' can be NULL here, but we should not dereference it before checking.
authorChristophe Jaillet <jailletc36@apache.org>
Mon, 14 May 2018 20:51:31 +0000 (20:51 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Mon, 14 May 2018 20:51:31 +0000 (20:51 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1831591 13f79535-47bb-0310-9956-ffa450edef68

modules/ssl/ssl_engine_kernel.c

index e310c09aa3d028b9938db1354e3789e44db3794e..5385dc516a5b8c1c233c70cae21a948b28ffe8d5 100644 (file)
@@ -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? */