crypto/x509v3/v3_utl.c, ssl/ssl_cert.c: fix Coverity problems. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4492)
diff --git a/ssl/ssl_cert.c b/ssl/ssl_cert.c index 008b58f..9a1d936 100644 --- a/ssl/ssl_cert.c +++ b/ssl/ssl_cert.c
@@ -468,18 +468,20 @@ SSLerr(SSL_F_SSL_DUP_CA_LIST, ERR_R_MALLOC_FAILURE); return NULL; } - if (!sk_X509_NAME_reserve(ret, num)) + if (!sk_X509_NAME_reserve(ret, num)) { + sk_X509_NAME_free(ret); return NULL; + } for (i = 0; i < num; i++) { name = X509_NAME_dup(sk_X509_NAME_value(sk, i)); if (name == NULL) { + SSLerr(SSL_F_SSL_DUP_CA_LIST, ERR_R_MALLOC_FAILURE); sk_X509_NAME_pop_free(ret, X509_NAME_free); - X509_NAME_free(name); return NULL; } sk_X509_NAME_push(ret, name); /* Cannot fail after reserve call */ } - return (ret); + return ret; } void SSL_set0_CA_list(SSL *s, STACK_OF(X509_NAME) *name_list)