diff options
| author | jkim <jkim@FreeBSD.org> | 2015-06-11 19:07:45 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2015-06-11 19:07:45 +0000 |
| commit | 5c266cb7c932e78233437385fe6993499ad9e2ea (patch) | |
| tree | fb5b3a19a5d9e924a0f43b0ef4999a09e22aa1b4 /crypto/openssl/ssl/ssl_lib.c | |
| parent | 3a6c5b791fafa79766a5c99c288a7d1ef495157a (diff) | |
| download | FreeBSD-src-5c266cb7c932e78233437385fe6993499ad9e2ea.zip FreeBSD-src-5c266cb7c932e78233437385fe6993499ad9e2ea.tar.gz | |
MFC: r284283
Merge OpenSSL 1.0.1n.
Diffstat (limited to 'crypto/openssl/ssl/ssl_lib.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_lib.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/openssl/ssl/ssl_lib.c b/crypto/openssl/ssl/ssl_lib.c index dead126..e11746a 100644 --- a/crypto/openssl/ssl/ssl_lib.c +++ b/crypto/openssl/ssl/ssl_lib.c @@ -1440,9 +1440,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); } |
