Fix possible NULL dereferencial. (28b958f7) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

ssl/ssl_lib.c

+20 −14

Original line number	Diff line number	Diff line
		@@ -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);
		}