Coverity 1503321 & 1503327: dereference after null check

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

(cherry picked from commit f80910390cb882f346fe59c9803fc914b9c367c2)

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