From: Pauli <pauli@openssl.org>
Date: Thu, 14 Jul 2022 05:09:36 +0000 (+1000)
Subject: Coverity 1503321 & 1503327: dereference after null check
X-Git-Tag: openssl-3.2.0-alpha1~2378
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f80910390cb882f346fe59c9803fc914b9c367c2;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/crypto/provider_core.c b/crypto/provider_core.c
index a2ac1ab0527..255b9560ded 100644
--- 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;
+    return prov->provctx != NULL ? prov->provctx : NULL;
 }
 
 /*