Mercurial > hg > nginx-quic
changeset 6870:0a08a8babf53
Stream: fixed handling of non-ssl sessions.
A missing check could cause ngx_stream_ssl_handler() to be applied
to a non-ssl session, which resulted in a null pointer dereference
if ssl_verify_client is enabled.
The bug had appeared in 1.11.8 (41cb1b64561d).
author | Vladimir Homutov <vl@nginx.com> |
---|---|
date | Thu, 19 Jan 2017 16:17:05 +0300 |
parents | b2915d99ee8d |
children | 1818acd8442f |
files | src/stream/ngx_stream_ssl_module.c |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/stream/ngx_stream_ssl_module.c +++ b/src/stream/ngx_stream_ssl_module.c @@ -287,11 +287,15 @@ ngx_stream_ssl_handler(ngx_stream_sessio ngx_connection_t *c; ngx_stream_ssl_conf_t *sslcf; + if (!s->ssl) { + return NGX_OK; + } + c = s->connection; sslcf = ngx_stream_get_module_srv_conf(s, ngx_stream_ssl_module); - if (s->ssl && c->ssl == NULL) { + if (c->ssl == NULL) { c->log->action = "SSL handshaking"; if (sslcf->ssl.ctx == NULL) {