Coverity 1503321 & 1503327: dereference after null check

The earlier fix being inadequate

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/18822)

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index 255b9560dedfb1fa36274838ea285fd6d29758ec..d224375571a50e02b79e74127183d1c67b70844d 100644 (file)
--- a/crypto/provider_core.c
+++ b/crypto/provider_core.c
@@ -1252,7 +1252,7 @@ int ossl_provider_deactivate(OSSL_PROVIDER *prov, int removechildren)
 
 void *ossl_provider_ctx(const OSSL_PROVIDER *prov)
 {
-    return prov->provctx != NULL ? prov->provctx : NULL;
+    return prov != NULL ? prov->provctx : NULL;
 }
 
 /*