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

34
ssl/ssl_lib.c
View file

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