diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2014-01-23 18:32:26 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2014-01-23 18:32:26 +0400 |
| commit | 54316a276d4dd8efab9d4d8fe4154546e3345686 (patch) | |
| tree | dcaa4a4ae91e144af082efa0a35c65e1fffde911 | |
| parent | 23ddf1464817e4fe1479427e9aed14c2ae64f44c (diff) | |
| download | nginx-54316a276d4dd8efab9d4d8fe4154546e3345686.tar.gz | |
SSL: fixed $ssl_session_id possible segfault after 97e3769637a7.
Even during execution of a request it is possible that there will be
no session available, notably in case of renegotiation. As a result
logging of $ssl_session_id in some cases caused NULL pointer dereference
after revision 97e3769637a7 (1.5.9). The check added returns an empty
string if there is no session available.
| -rw-r--r-- | src/event/ngx_event_openssl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index 9b1804e47..915e604bb 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -2233,6 +2233,10 @@ ngx_ssl_get_session_id(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s) SSL_SESSION *sess; sess = SSL_get0_session(c->ssl->connection); + if (sess == NULL) { + s->len = 0; + return NGX_OK; + } buf = sess->session_id; len = sess->session_id_length; |