wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix possible NULL dereferencial.

Browse source 
Notified by Verdon Walker <VWalker@novell.com>
This commit is contained in:
Richard Levitte 2003-01-16 06:00:55 +00:00
parent 4e59cd3bb6
commit 28b958f732
1 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ssl/ssl_lib.c
View file

@ -1073,7 +1073,9 @@ int ssl_cipher_ptr_id_cmp(const SSL_CIPHER * const *ap,
* preference */
STACK_OF(SSL_CIPHER) *SSL_get_ciphers(SSL *s)
{
if ((s != NULL) && (s->cipher_list != NULL))
if (s != NULL)
{
if (s->cipher_list != NULL)
{
return(s->cipher_list);
}
@ -1082,6 +1084,7 @@ STACK_OF(SSL_CIPHER) *SSL_get_ciphers(SSL *s)
{
return(s->ctx->cipher_list);
}
}
return(NULL);
}
@ -1089,15 +1092,18 @@ STACK_OF(SSL_CIPHER) *SSL_get_ciphers(SSL *s)
* algorithm id */
STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s)
{
if ((s != NULL) && (s->cipher_list_by_id != NULL))
if (s != NULL)
{
if (s->cipher_list_by_id != NULL)
{
return(s->cipher_list_by_id);
}
else if ((s != NULL) && (s->ctx != NULL) &&
else if ((s->ctx != NULL) &&
(s->ctx->cipher_list_by_id != NULL))
{
return(s->ctx->cipher_list_by_id);
}
}
return(NULL);
}