Mercurial > hg > nginx

changeset 8324:7cca3624f9c4 quic

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added check for SSL_get_current_cipher() results. The function may return NULL and result need to be checked before use.
author Vladimir Homutov <vl@nginx.com>
date Sat, 04 Apr 2020 22:25:41 +0300
parents 853908b5a216
children 9b9d592c0da3
files src/event/ngx_event_quic_protection.c
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event_quic_protection.c
+++ b/src/event/ngx_event_quic_protection.c
@@ -62,13 +62,19 @@ static ngx_int_t
 ngx_quic_ciphers(ngx_ssl_conn_t *ssl_conn, ngx_quic_ciphers_t *ciphers,
     enum ssl_encryption_level_t level)
 {
-    ngx_int_t  id, len;
+    ngx_int_t          id, len;
+    const SSL_CIPHER  *cipher;
 
     if (level == ssl_encryption_initial) {
         id = NGX_AES_128_GCM_SHA256;
 
     } else {
-        id = SSL_CIPHER_get_id(SSL_get_current_cipher(ssl_conn)) & 0xffff;
+        cipher = SSL_get_current_cipher(ssl_conn);
+        if (cipher == NULL) {
+            return NGX_ERROR;
+        }
+
+        id = SSL_CIPHER_get_id(cipher) & 0xffff;
     }
 
     switch (id) {