From 86f31dd9cc81d1c2429846ab663ecd8a29333e3b Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 21 Jun 2017 15:52:11 +0100 Subject: Remove OPENSSL_assert() from various crypto/bio files bss_dgram.c is deferred until later due to ongoing discussions. Reviewed-by: Andy Polyakov (Merged from https://github.com/openssl/openssl/pull/3740) --- crypto/bio/b_addr.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'crypto/bio/b_addr.c') diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c index b8e1f96e07..d3b758fc7a 100644 --- a/crypto/bio/b_addr.c +++ b/crypto/bio/b_addr.c @@ -7,6 +7,7 @@ * https://www.openssl.org/source/license.html */ +#include #include #include "bio_lcl.h" @@ -565,7 +566,8 @@ static int addrinfo_wrap(int family, int socktype, unsigned short port, BIO_ADDRINFO **bai) { - OPENSSL_assert(bai != NULL); + if (bai == NULL) + return 0; *bai = OPENSSL_zalloc(sizeof(**bai)); if (*bai == NULL) @@ -760,8 +762,11 @@ int BIO_lookup_ex(const char *host, const char *service, int lookup_type, he_fallback_address = INADDR_ANY; break; default: - OPENSSL_assert(("We forgot to handle a lookup type!" == 0)); - break; + /* We forgot to handle a lookup type! */ + assert("We forgot to handle a lookup type!" == NULL); + BIOerr(BIO_F_BIO_LOOKUP_EX, ERR_R_INTERNAL_ERROR); + ret = 0; + goto err; } } else { he = gethostbyname(host); -- cgit v1.2.3