Commit 14def5f5 authored by Matt Caswell's avatar Matt Caswell
Browse files

Check sk_SSL_CIPHER_new_null return value 



If sk_SSL_CIPHER_new_null() returns NULL then ssl_bytes_to_cipher_list()
should also return NULL.

Based on an original patch by mrpre <mrpre@163.com>.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent fae4772c

ssl/ssl_lib.c

+6 −2
Original line number Diff line number Diff line
@@ -1483,9 +1483,13 @@ STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, 
               SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST);

        return (NULL);

    }

    if ((skp == NULL) || (*skp == NULL))

    if ((skp == NULL) || (*skp == NULL)) {

        sk = sk_SSL_CIPHER_new_null(); /* change perhaps later */

    else {

        if(sk == NULL) {

            SSLerr(SSL_F_SSL_BYTES_TO_CIPHER_LIST, ERR_R_MALLOC_FAILURE);

            return NULL;

        }

    } else {

        sk = *skp;

        sk_SSL_CIPHER_zero(sk);

    }